7d6986a650
Merge pull request #4346 from Fox-McCloud/overdose-rework
...
Overdose Rework and Food Poisoning
2016-05-04 20:52:37 -04:00
08ec1db17e
food poisoning
2016-05-04 19:58:44 -04:00
c70c8d9c39
Merge pull request #4304 from Aurorablade/JustTraitorThings
...
Crazy Fethas Traitor Emporium of Horrors
2016-05-04 01:22:13 -04:00
37d9cc49dc
removes from uplink until fixed
...
renames old sniper icons to esniper and new sniper to just sniper
2016-05-04 00:34:28 -04:00
b295e7809e
Overdose Rework
2016-05-03 19:55:11 -04:00
5f0dde2f65
Apprently this ammo isn't a thing on TG anymore
2016-05-02 23:25:46 -04:00
5435084dc7
Merge pull request #4328 from Fox-McCloud/tesla-update
...
Tesla Update/Rebalance
2016-05-01 12:52:40 -04:00
dbc65dc7ec
tweaks on feedback
2016-04-30 16:04:56 -04:00
5ca5cff788
Merge pull request #4320 from IK3I/Tox-Comp-Fix
...
Adds check for synthetic parts in tox-comp
2016-04-30 09:34:55 -04:00
8322aa9338
Tesla Update/Rebalance
2016-04-30 06:44:01 -04:00
f8ce4e5fb2
Traitor panel now properly removes special role from deculted cultists
2016-04-30 03:10:37 -07:00
8d18ce19df
Incorporates Suggestions for code format
...
Redoes get_damaged_organs() to use defines and flags instead of strings.
2016-04-29 21:43:19 -05:00
7e405427aa
changess
2016-04-29 02:09:05 -04:00
7a99d8fe74
Crazy Fethas Traitor Emporium of Horrors
2016-04-27 19:09:21 -04:00
110958860b
Merge pull request #4270 from FlattestGuitar/foamforce
...
Ports /tg/ FOAM FORCE
2016-04-27 11:43:55 -04:00
0f7be5576f
Gunshot sounds, uplink references, less spammy tommygun, fixes
2016-04-25 11:32:48 +02:00
03c173aeaf
Lowers costs, adds darts to autolathe
2016-04-24 09:19:03 +02:00
cb38f7b0f9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu
2016-04-22 21:45:18 -04:00
5cf3f25892
Ports /tg/ Foam Force guns
2016-04-22 23:35:55 +02:00
7594206d16
Merge pull request #4261 from Tastyfish/vampfix
...
Fixes devamping via the traitor panel
2016-04-21 20:15:19 -04:00
b798e7ef18
Fixes devamping in traitor panel
2016-04-21 19:58:49 -04:00
991976fbcb
before tiger kills me...
2016-04-19 17:30:13 -04:00
87a9f30bd4
Part 6
2016-04-18 05:32:41 -04:00
fe170db7bb
part 3
2016-04-17 10:35:10 -04:00
2453735d3f
part 2
2016-04-17 00:21:31 -04:00
2d85f582e1
martial arts shit
2016-04-16 22:22:21 -04:00
f817351d2a
part1
2016-04-16 10:40:21 -04:00
7700d224a3
Merge pull request #4202 from Crazylemon64/rubber_stamps_are_bureaucracy
...
Adds granted and denied stamps to the bureaucracy crate
2016-04-15 20:17:35 -04:00
5259dc6b1a
Merge pull request #4138 from Fox-McCloud/door-sounds
...
New Airlock Sounds
2016-04-14 22:44:54 -04:00
eba294357a
It's the bees
2016-04-14 20:30:30 -04:00
880056a87d
Adds granted and denied stamps to the bureaucracy crate
2016-04-14 08:22:37 -07:00
b0fd688ed5
Merge pull request #4190 from Meisaka/fix-law
...
Fix Malf Law in Law manager
2016-04-13 16:24:57 -04:00
80b8aee935
Replace format code
2016-04-14 03:21:23 +09:00
dab1303d46
Merge pull request #4150 from Tastyfish/away-reorder
...
Updates maploader code to be in line with tg's, startup improvements
2016-04-11 19:41:22 -04:00
a0ad6582a1
Updates maploader code to be in line with tg's, startup improvements
2016-04-10 02:57:58 -04:00
9ecf552708
Merge pull request #4127 from Fox-McCloud/traitor-vamp
...
Traitor Vamp
2016-04-09 22:17:15 -04:00
20f8ca1095
Fixes meals prepared / food eaten scoreboard stats
2016-04-09 02:28:53 -04:00
b315879c0d
New Airlock Sounds
2016-04-08 05:44:49 -04:00
6965d43aab
tweaks
2016-04-07 23:45:03 -04:00
4d58019d69
Traitor Vamp
2016-04-07 08:45:44 -04:00
78f53553f8
Reduce lines by removing blank lines added by PJ's script
2016-04-05 08:25:57 -07:00
9d430844c3
Replace most (if not all) output << operators with to_chat(user, message)
...
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
62bfc02852
Merge pull request #4070 from Crazylemon64/virus-stealth-fix
...
Fixes virus stealth to work as reported
2016-04-04 18:59:46 -04:00
752d106bef
Merge pull request #4067 from tigercat2000/510staging
...
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
824019ff6c
Makes it so that at 3 steath you are invisible to pandemic, instead of 4
2016-04-02 16:01:03 -07:00
a5045d0c33
Fixes virus stealth to work as reported
2016-04-02 15:42:55 -07:00
a42bcb53e3
Merge pull request #4061 from Aurorablade/AntagHudUpdates
...
Antag Hud updates
2016-04-02 04:13:20 -04:00
7a41efd1da
Last staging fixes
2016-04-01 16:09:43 -07:00
519992b5a9
Merge branch 'byond510'
...
Conflicts:
.travis.yml
code/game/jobs/access.dm
code/game/machinery/camera/camera.dm
code/game/machinery/flasher.dm
code/game/machinery/vending.dm
code/game/objects/items/devices/laserpointer.dm
code/game/objects/items/weapons/grenades/flashbang.dm
code/game/objects/items/weapons/tools.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/life.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/nano/modules/virus2_creator.dm
code/modules/virus2/disease2.dm
code/modules/virus2/diseasesplicer.dm
paradise.dme
2016-04-01 14:15:44 -07:00
1db93aae1f
Iseeytou
2016-03-31 22:33:29 -04:00
TheDZD