Commit Graph

3571 Commits

Author SHA1 Message Date
Razharas
93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
Cheridan
cbe2e310c6 Merge pull request #11573 from Fox-McCloud/plasmagold
Fixes Gold Sheets Containing Plasma
2015-09-05 11:54:34 -05:00
bgobandit
362157a5d5 t y p o h o n k 2015-09-04 22:21:51 -04:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Fox-McCloud
0b8f2476b4 Fixes Gold Sheets Containing Plasma 2015-09-04 01:44:13 -04:00
bgobandit
1748a8c261 ADDS EXTRA HONK 2015-09-03 14:34:53 -04:00
bgobandit
ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
Aranclanos
d2903d077f Merge pull request #11530 from xxalpha/coilcablecorrection
Fixed a couple of bugs with cable coils.
2015-09-02 22:55:47 -03:00
palpatine213
00f01159b1 Fixes Merge conflicts 2015-09-01 19:46:30 -07:00
xxalpha
70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +01:00
Razharas
72610973cc Merge pull request #11427 from xxalpha/magborg
Gave engineering cyborgs permanent magboots effect.
2015-09-01 17:31:15 +03:00
Razharas
9d6ce85e9a Merge pull request #11414 from Xhuis/shadowling_update_4
Shadowling Update IV
2015-09-01 17:19:07 +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
6464aafa7c Merge pull request #11494 from Aranclanos/PDAqdel
Fixes PDAs being able to send messages to other PDAs in the qdel queue
2015-09-01 15:53:26 +03:00
Razharas
30ac2634f4 Merge pull request #11250 from GunHog/Malf_RCD-defense
Buffs RCD Disable Malfunction ability
2015-09-01 11:50:17 +03:00
Razharas
446e784017 Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor
Cyborgs unlocking cover and AI unanchoring upon dying.
2015-09-01 10:08:08 +03:00
Razharas
e18032c87a Merge pull request #11411 from Xhuis/help_xenos_in_medbay_maint
MEGA Toys presents: Xenos Isolated action figure!
2015-09-01 09:58:15 +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
Cheridan
da60a351bd Merge pull request #11493 from Aranclanos/camerabugloop
Fixes an infinite loop with camera bugs.
2015-08-31 22:38:02 -05: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
palpatine213
dd7b84228b Fixes infinite loop. 2015-08-30 18:30:55 -07:00
palpatine213
877111b8e6 Removed upgrade mechanics from camera bugs. They come build in with networking, sabotage, and tracking upgrades. Also added camera disable button to track menu. 2015-08-30 17:58:27 -07:00
Aranclanos
2e09313b26 Fixes PDAs being able to send messages to other PDAs in the qdel queue 2015-08-30 20:18:50 -03:00
Aranclanos
1abeb952a4 Fixes an infinite loop with camera bugs. 2015-08-30 19:43:27 -03:00
Razharas
d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03: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
7a469e240a Merge pull request #11437 from bgobandit/dronepax
Refactors medical stacks used on simple animals.
2015-08-29 18:55:27 -05:00
xxalpha
3379cb8145 Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly. 2015-08-29 19:24:36 +01:00
Cheridan
87eae12f89 Merge pull request #11425 from bgobandit/golemsandglass
Golems no longer take damage from attacking with glass shards.
2015-08-29 11:17:34 -05:00
bgobandit
1e57cc6845 fixes ellipsis 2015-08-28 14:22:29 -04:00
bgobandit
607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax
Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm
2015-08-28 02:54:43 -04:00
bgobandit
6f6744da33 Refactors healing simple animals with bruise packs. 2015-08-28 02:02:43 -04:00
Cheridan
7f0f74f100 Merge pull request #11380 from bgobandit/salicyclicassblastusa
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
2015-08-27 23:53:58 -05:00
bgobandit
326d849836 You can no longer use bruise packs, ointment or other medical stack items on drones. 2015-08-28 00:51:24 -04:00
Xhuis
df9e581df0 Shadowling update 4 2015-08-27 19:29:33 -04:00
c0
14bd455287 Button frame added to metal 2015-08-28 02:04:33 +03:00
c0
8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
xxalpha
f8f5f689d9 Gave engineering cyborgs permanent magboots effect. 2015-08-27 20:23:35 +01:00
bgobandit
1009c08ff4 Golems no longer take damage from attacking with glass shards. 2015-08-27 14:55:48 -04:00
xxalpha
19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc.
Return ..()
2015-08-27 11:10:58 +01:00
bgobandit
4fe28339c5 Makes requested changes. 2015-08-26 18:37:14 -04:00
Xhuis
0b25b9e3b8 Fixes oversight 2015-08-26 18:03:13 -04:00
Xhuis
8f7f540a3b Fixes code errors 2015-08-26 17:39:59 -04:00
Xhuis
fdc060a015 Xenomorph action figure 2015-08-26 17:33:59 -04:00
Aranclanos
38e6a09cf9 Merge pull request #11351 from Core0verload/nodirt
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
bgobandit
6ab2443255 Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog. 2015-08-25 13:46:05 -04:00
bgobandit
132adf3f00 adds silver sulf syringes instead of kelotane pills 2015-08-24 21:45:18 -04:00
bgobandit
ce8722b868 Fixes burn kits containing salicyclic acid pills. 2015-08-24 21:36:50 -04:00