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
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
xxalpha
382cd870aa
Airlock construction icons
...
Removed leftover comments
2015-08-27 10:05:46 +01:00
Aranclanos
38e6a09cf9
Merge pull request #11351 from Core0verload/nodirt
...
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
Ergovisavi
9572bd6aa6
-First revision of Swarmer mob, hud, icons, etc
...
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
2015-08-25 03:24:34 -07:00
c0
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03:00
Supermichael777
e0c6c710c2
Update barsigns.dm
2015-08-20 20:08:23 -04:00
Supermichael777
6fe5f23e55
Updates dank memes.
...
updates Bar memes to reflect recent rule changes/be funny.
2015-08-20 15:06:42 -04:00
Remie Richards
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
Swag McYolosteinen
6b091e0cb6
Merge pull request #11086 from freerealestate/rcdrebalance
...
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
phil235
1cee0d3014
Fixes slipping on water while riding janicart.
...
The handle_slip() now also handles cases where the mob is buckled. If you are buckled and slip on lube (or something that ignores
galoshes) you get unbuckled and stunned and the buckle object moves one step (no slides unlike when unbuckled).
You can thus slip on lube while buckled to a chair or a roller bed.
Fixes getting hit by abstract held items when slipping.
Fixes janicart rider getting hit twice by bullets.
Removing the STEP constant var in slipping code, it's no more used.
Fixes carbon/slip() not returning the correct value.
Changed var/obj/structure/stool/bed/buckled to var/obj/buckled since buckled can now technically be any obj.
Removes hacky unbuckling/buckling in bed/Move()
2015-08-13 23:49:02 +02:00
Swag McYolosteinen
46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
Swag McYolosteinen
2bb4f63023
Merge pull request #11087 from phil235/GirderSinguloPull
...
Girder deconstruction bugfix
2015-08-13 16:33:28 +02:00
WJohn
9104fd7456
Merge pull request #11107 from Core0verload/bedfix
...
Fixes #11090
2015-08-12 19:43:28 -04:00
Remie Richards
eedea4d281
Merge pull request #11018 from Core0verload/hammerspace
...
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
phil235
70a8046081
Merge pull request #10815 from bgobandit/bagtags
...
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
c0
1f8a439fb2
Fixes bedsheet-capes sprites.
2015-08-09 01:42:36 +03:00
c0
2e5cedef74
Added alien organs
2015-08-09 01:12:32 +03:00
