ac41b600ce
Merge pull request #11718 from phil235/TableClimbingFixes
...
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
d57fac141a
Merge pull request #11724 from RemieRichards/LargeInhands
...
Inhands can now come in ANY SIZE, not just 32x32!
2015-09-13 17:23:36 +02:00
7b6bbbfed1
Further tweaks.
2015-09-13 16:17:50 +01:00
4bb97067b2
Tweaks amount of footprints, and fixes some bugs related to footprints, adds shoetype tracking to footprints
2015-09-13 15:36:56 +01:00
9b668de7bb
Merge remote-tracking branch 'upstream/master' into Impropermaterials
2015-09-13 08:58:40 -04:00
5783cdda03
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
7530c0e133
Merge pull request #11680 from bgobandit/honktarget
...
Adds a clown shooting target.
2015-09-13 21:50:53 +10:00
43371ccef8
change bb to BB to gain favor with goofball
2015-09-12 23:47:29 -07:00
815ef798e9
Fixes the last remaining associative lists from pipes
2015-09-12 20:57:16 -03:00
f478c5ebb0
Merge remote-tracking branch 'upstream/master' into suicides-sep12
2015-09-12 16:53:00 -07:00
c557f763d8
YOU'LL SHOOT YOUR EYE OUT, KID! also: minor fix to newspaper suicide language
2015-09-12 16:52:27 -07:00
c4505bd25b
Fixes false walls opening sprite and a small runtime when they finish their opening or close in the GC queue.
2015-09-12 20:37:22 -03:00
9a21b5d73b
HE SHALL RIDE ETERNAL, SHINY AND CHROME
2015-09-12 15:18:29 -07:00
ffa823e5b9
floor tile materials fixup
2015-09-12 16:11:48 -04:00
cf2d0903f6
Added a new formal jacket to the captain's locker
2015-09-12 21:10:16 +01:00
a9e4af8146
it will no longer explode randomy but has a higher chance to bounce
2015-09-12 12:23:03 -04:00
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
ae117c134b
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
code/game/jobs/job/security.dm
2015-09-12 18:43:15 +08:00
89fa65c127
Fixes Consistency Issue with Materials
2015-09-12 03:51:33 -04:00
82e577be0b
Items may now have inhands from 1x1 (why) to INFINITYxINFINITY (again, WHY), this allows for ridiculously large items!
...
Adds a center_image() proc that centers an image larger or smaller than world.icon_size (32) so that it appears in the center of a human mob, like inhands.
2015-09-12 00:45:14 +01:00
585e678b41
Implemented Nienhaus' cardboard box sprite (pending apparently better sprite(s) coming)
...
Every roundstart generic locker now has a 20% chance of instead being a cardboard box (this is not the same thing as "20% of all lockers are now boxes" but it's a rough approximation).
As an easter egg, if you open a box containing a person everyone in sight will get a ! alert. This effect can only be triggered if someone other than the person in the box is the one who opens it. As a further safeguard against spamming this can happen at most once every minute.
2015-09-11 18:00:17 -04:00
922cd5d666
removed extraneous hgibs() call in tanks.dm, turned spaces to tabs in affected files to make remie and everyone else happy
2015-09-11 13:03:33 -07:00
3e4c8ab291
tank suicide: pops you like a balloon and spits out your brain, also minor style change for consistency on telebaton
2015-09-11 11:48:30 -07:00
64fd1c317c
telebaton suicide: changed message, added gibs, added removal of brain
2015-09-11 11:30:36 -07:00
c069ea0a7d
Fixes runtime in monkey/attack_hand()
...
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
2015-09-11 18:08:54 +02:00
eb7e466dfe
Changed facehuggers and alien eggs layers to MOB_LAYER
2015-09-11 14:31:17 +01:00
3a63c31614
Merge pull request #11626 from Memendia/master
...
Suicide txt fix
2015-09-11 14:16:30 +03:00
45fb337732
Merge pull request #11487 from bgobandit/matsblastusa
...
Adds materials to some items for recycling purposes.
2015-09-11 14:03:18 +03:00
f3ae87756c
Merge pull request #11649 from Firecage/bucklingtext
...
Fixes the buckling message.
2015-09-11 04:03:40 +03:00
3ef306fc4e
Adds large cardboard boxes to the game, constructable from five sheets of cardboard.
...
Cardboard boxes are closets that:
*Can only carry a single person
*Are easy to destroy
*Are flammable
*Can't be welded shut
They can also can be used for more "tactical" purposes, at the same speed as walking.
Takes the opportunity to remove some object unfriendly coding.
If this is accepted they'll be a pull a little later to replace a few closets on the maps with boxes (or maybe code to have generic closets on the map to occasionally spawn as boxes instead).
2015-09-10 19:29:19 -04:00
778564986d
Gives the QM and cargo techs the QM cartridge.
...
Added rarity values for plants lacking them.
2015-09-10 19:06:42 -04:00
2f9cbf9536
suicide messages for damp rag, tanks, and telebaton
2015-09-10 11:44:27 -07:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
6eac77fcfd
Rifle
2015-09-10 13:14:41 +08:00
f524f5b7e5
Balances syndicate bundles. BOY OH BOY OH BOY
2015-09-10 00:46:50 -04:00
4efae3bc02
Mop progress bar now actually works.
2015-09-09 22:04:47 -04:00
cf42935119
Adds extra HONK. Tweaks sprite.
2015-09-09 16:27:21 -04:00
a8ce6c012b
Adds a clown shooting target for security to unload their anger.
2015-09-09 14:35:45 -04:00
b3b9941432
Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
...
Conflicts:
code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
b238ac02e8
Xeno tweaks and bugfixes.
2015-09-09 17:54:59 +01:00
bdc9b792f7
buckling text span fix.
2015-09-09 09:29:51 +02:00
d45890b4df
Merge branch 'master' of https://github.com/tgstation/-tg-station into GunsEdition
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-09 11:47:44 +08:00
fda59dc3f5
Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-09 02:41:34 +01:00
161156cffc
Merge pull request #11585 from bgobandit/legitposters
...
Poster changes!
2015-09-09 02:38:56 +03:00
d6f0c2484a
InitalCommit
2015-09-08 19:56:07 +08:00
812f5b4094
Fixes the buckling message.
2015-09-07 23:52:30 +02:00
2cee8c85dc
Reworks the poster lists per cheridan
2015-09-07 12:18:06 -04:00
9f0f1a9234
Merge pull request #11531 from RemieRichards/Bloody_footprints
...
Bloody footprints!
2015-09-07 16:07:03 +03:00
27f33581d2
Merge pull request #11518 from xxalpha/xenoweedspread
...
Changed weed spread to be like gas spread.
2015-09-07 13:51:52 +01:00
72ac379bbf
henk
2015-09-07 07:18:58 -04:00
Swag McYolosteinen
Remie Richards
Fox-McCloud
Steelpoint
Jordie
Marc R. Uchniat
Aranclanos
Thunder12345
Supermichael777
bear1ake
Incoming
phil235
xxalpha
Razharas
bgobandit
Firecage