Commit Graph

1534 Commits

Author SHA1 Message Date
KorPhaeron 0afa381114 Removes potential exploit 2015-09-22 20:12:14 -05:00
KorPhaeron 1484390e76 Removes extra bits 2015-09-22 06:05:17 -05:00
KorPhaeron cce0bf2e9d Meatspike 2015-09-22 05:33:02 -05:00
AnturK a524268b4d Fix 2015-09-17 17:53:27 +02:00
AnturK a668109c3d Adds ID unlocking
Fixes directional issues
2015-09-17 17:53:26 +02:00
AnturK 8067597beb Display case chasssis 2015-09-17 17:53:26 +02:00
AnturK b72de17b50 Adds icon for open but not broken case. 2015-09-17 17:53:25 +02:00
AnturK ac813a0ced Display cases 2015-09-17 17:53:24 +02:00
Cheridan 76d1e6add5 Merge pull request #11556 from bgobandit/hardmeatspike
MEAT SPIKE EXPANSION
2015-09-16 20:19:42 -05:00
Swag McYolosteinen 3ef5d02cee Merge pull request #11689 from Steelpoint/RifleS
Security Weapon Overhaul: Auto Rifle Edition
2015-09-16 13:34:35 +02:00
Razharas 73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
Aranclanos da3213968c Merge pull request #11780 from optimumtact/patch-5
EXTERMINATE EXTERMINATE EXTERMINATE
2015-09-15 16:02:32 -03:00
phil235 2a5d0b96a1 Merge pull request #11747 from Aranclanos/falsewalls
Fixes false walls opening sprite
2015-09-14 20:33:12 +02:00
phil235 e46f764113 Merge pull request #11623 from Fox-McCloud/qmvoucher
Adds Mining Voucher to QM's Locker
2015-09-14 19:59:47 +02:00
Jordie 41e426c5ef Merge pull request #11744 from Thunder12345/cap-uniform
Added a new formal jacket to the captain's locker
2015-09-14 20:36:15 +10:00
Orange Borg 27a23a845f EXTERMINATE EXTERMINATE EXTERMINATE 2015-09-14 22:06:47 +12:00
phil235 428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
Thunder12345 6724b7bca7 Make formal jacket a subtype of the carapace, replaces spare carapace in captain's locker, and is armoured 2015-09-13 17:10:30 +01:00
Swag McYolosteinen ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
Fox-McCloud 9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Steelpoint 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
Aranclanos 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
Thunder12345 cf2d0903f6 Added a new formal jacket to the captain's locker 2015-09-12 21:10:16 +01:00
Fox-McCloud 89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
phil235 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
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Steelpoint 6eac77fcfd Rifle 2015-09-10 13:14:41 +08:00
Steelpoint d6f0c2484a InitalCommit 2015-09-08 19:56:07 +08:00
Fox-McCloud e8bccf6f0d Adds Mining Voucher to QM's Locker 2015-09-07 03:59:49 -04:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
duncathan 6c2dd46b07 fixes my mistakes haha woops 2015-09-03 00:10:29 -06:00
duncathan 22b2c803fd improves setting of icon_state, meattype, and skintype in attackby() 2015-09-02 22:39:58 -06:00
duncathan 0adb97522f improves defines and meat/skin creation 2015-09-02 22:05:59 -06:00
bgobandit ae37baf75a Implements the absolute height of inconsistent stupidity. 2015-09-02 22:59:48 -04:00
bgobandit 1db6cc9d9a Addresses super's concerns. Adjusts damage down. 2015-09-02 22:04:22 -04:00
bgobandit 64089be82d I love typos 2015-09-02 20:43:12 -04:00
bgobandit 94490f12d1 Adds some meat spike functionality. 2015-09-02 20:32:38 -04:00
Razharas bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas b2654acec5 Merge pull request #11247 from xxalpha/airlocking
Airlock Overlays
2015-09-01 11:49:05 +03:00
duncathan 48b67e5a25 Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE
Conflicts:
	code/game/objects/effects/landmarks.dm
2015-09-01 00:11:33 -06:00
xxalpha 3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-08-31 08:52:30 +01:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
xxalpha 94f045b73f Merge remote-tracking branch 'upstream/master' into airlocking
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41F.dmm
	code/game/objects/structures/door_assembly.dm
2015-08-30 19:53:54 +01:00
Cheridan 32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0 97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
Cheridan d824f7b35f Merge pull request #11382 from Ergovisavi/bot_swarm
Adds "Swarmers" - Simple mob side antagonist
2015-08-28 00:21:23 -05:00
Ergovisavi 3737234b9c -Adds swarmer as a language, makes them only able to speak to each other
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
2015-08-27 22:10:30 -07:00
c0 8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
xxalpha 4ed1937168 Completed construction icons 2015-08-27 18:40:08 +01:00
xxalpha b9db8ce854 A few qdel fixes. 2015-08-27 13:15:41 +01:00