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
046b7fbad3
I told ya
2015-09-07 03:40:07 -07:00
e8bccf6f0d
Adds Mining Voucher to QM's Locker
2015-09-07 03:59:49 -04:00
3e4299105d
adds heat exchanging manifolds, both 3-way and 4-way
2015-09-06 15:06:59 -06:00
51934abbc8
Reworked nuke deconstruction. New nuke sprites. More++
...
Changelog
2015-09-06 21:35:14 +01:00
fd5e854118
IF TRAVIS DOES NOT WORK AFTER THIS I SWEAR TO CLOWN
2015-09-06 14:02:10 -04:00
c5984f4359
Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
93b9f96cfa
Merge pull request #11341 from bgobandit/suicideisnotajoke
...
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
3847e06903
Merge pull request #11594 from Xhuis/the_poltergeistening
...
Fixes being unable to buckle into chairs and beds
2015-09-06 06:33:32 +03:00
d7ffc1bd7e
Removes some commented code and fixes a typo
2015-09-05 14:43:12 -04:00
1f4313f7ad
Fixes buckling
2015-09-05 14:41:08 -04:00
cbe2e310c6
Merge pull request #11573 from Fox-McCloud/plasmagold
...
Fixes Gold Sheets Containing Plasma
2015-09-05 11:54:34 -05:00
362157a5d5
t y p o h o n k
2015-09-04 22:21:51 -04:00
5cbe9e17e2
TRAVIS NOW COMPILES.
2015-09-04 19:17:51 -04:00
b9e779dc54
Makes Travis compile hopefully.
2015-09-04 19:13:51 -04:00
261494e659
Made some changes and repathing for posters.
2015-09-04 18:30:58 -04:00
1fc5ed65a4
Xeno corrosive acid no longer spaces asteroid walls and floors.
2015-09-04 10:33:00 +02:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
Steelpoint
Fox-McCloud
Remie Richards
Incoming
Marc R. Uchniat
phil235
xxalpha
Razharas
bgobandit
bear1ake
Firecage
Memendia
duncathan
Xhuis
Cheridan
c0