Tigercat2000
94ff8fc4ef
whoops forgot to remove this
2016-04-02 21:32:11 -07:00
Aurorablade
e045e10268
remoing pasted line
...
i need to remove the rest of em later.
2016-04-02 23:42:14 -04:00
Aurorablade
279937c58b
Fixes IPC Embbedded object surgery
2016-04-02 23:34:38 -04:00
Tigercat2000
1d7ca47bf5
and line notes 2
2016-04-02 20:30:41 -07:00
Tigercat2000
b4eaf130b0
Merge remote-tracking branch 'upstream/master' into tgport-16569
...
Conflicts:
.gitignore
2016-04-02 20:29:28 -07:00
Fox McCloud
c75aededf4
Merge pull request #4072 from Crazylemon64/slime_syringe_fix
...
Using a syringe on slime people will now get water out of them
2016-04-02 22:47:00 -04:00
Fox McCloud
752d106bef
Merge pull request #4067 from tigercat2000/510staging
...
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
monster860
d379822c9c
Adds link mode
2016-04-02 21:40:49 -04:00
Tigercat2000
8e7c447646
Ports tgstation/-tg-station#16569 , World Topic() changes
...
Full changes:
- World Topic() is now standardized to use if("parameter" in topic_list)
instead of an amalgamation of findtext() and if(topic == "parameter").
- Comms password is now verified at the top of world/Topic() and sets a
variable to true if it is present and correct.
- "status" now returns extra information if the comms_password is
provided and correct.
Misc changes:
- Shuttle text has been standardized as a proc on mobile docking ports.
This is used by status/supply displays and mob/Stat() for the -ETA- etc stuff.
2016-04-02 17:38:49 -07:00
Crazylemon64
93aa9c688a
Using a syringe on slime people will now get water out of them
2016-04-02 16:59:53 -07:00
Crazylemon64
824019ff6c
Makes it so that at 3 steath you are invisible to pandemic, instead of 4
2016-04-02 16:01:03 -07:00
Crazylemon64
a5045d0c33
Fixes virus stealth to work as reported
2016-04-02 15:42:55 -07:00
Fox McCloud
a42bcb53e3
Merge pull request #4061 from Aurorablade/AntagHudUpdates
...
Antag Hud updates
2016-04-02 04:13:20 -04:00
Fox McCloud
817b7928eb
Merge pull request #4058 from FalseIncarnate/reagents
...
Reagent Container Tweaks
2016-04-02 04:12:23 -04:00
Fox McCloud
13200e7c62
Merge pull request #4049 from Aurorablade/FethasStaph
...
Fethas Carnival of Horrors:Fethas Please Stop
2016-04-01 20:43:06 -04:00
Fox McCloud
d7363f5ffb
Merge pull request #4064 from VampyrBytes/trashNforks
...
Fixes forks producing trash/not leaving trash
2016-04-01 19:53:26 -04:00
Tigercat2000
d1ae725fa2
fix tile_bound
2016-04-01 16:36:39 -07:00
Tigercat2000
7a41efd1da
Last staging fixes
2016-04-01 16:09:43 -07:00
Tigercat2000
a36ec06fc2
First 510 merge fixes
2016-04-01 14:20:17 -07:00
Tigercat2000
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
TheDZD
54ed72ffd4
Merge pull request #4052 from Fox-McCloud/simple-animal-eating
...
Refactor of Simple Animal Eating
2016-04-01 15:43:16 -04:00
TheDZD
c659cca883
Merge pull request #4046 from Fox-McCloud/full-add
...
Fully Re-Activates Disease1
2016-04-01 15:42:02 -04:00
FalseIncarnate
777f8cbfb6
Beaker and Pill Bottle Labeling
...
Can now label Pill Bottles with pens, just like Beakers
Beakers (and pill bottles) can now accept 26 character labels from pens.
2016-04-01 15:17:47 -04:00
VampyrBytes
48ba721b91
Fixes forks producing trash/not leaving trash
...
Fixes #4059
Forks now don't produce trash when eaten off
Forks now do leave trash when taking the last bit of food from the
original item
2016-04-01 08:05:57 +01:00
Fox-McCloud
e277cf292b
Headcrab Fix
2016-04-01 01:11:11 -04:00
Fox-McCloud
5d8b02b37a
cleanup
2016-04-01 00:39:48 -04:00
Aurorablade
1db93aae1f
Iseeytou
2016-03-31 22:33:29 -04:00
Fox McCloud
80ae4bff80
Merge pull request #4045 from ProperPants/Cyborg_Stacks
...
Cleaning and Definition of Cyborg Stacks
2016-03-31 22:24:19 -04:00
FalseIncarnate
2338cfecfe
One more color macro
2016-03-31 21:43:04 -04:00
FalseIncarnate
ce18b58e20
Prevents splashing onto closed beakers
...
Also removes relative pathing and replaces color macros in
glass_containers.dm
2016-03-31 21:36:38 -04:00
FalseIncarnate
0d440f088a
Notify player when filling full container from sink
2016-03-31 21:12:46 -04:00
Fox-McCloud
0c74d7bc29
nanomachines traitor bottle
2016-03-31 20:38:15 -04:00
Fox McCloud
bca1fd7005
Merge pull request #4044 from Tastyfish/orange-hampsters
...
Adds power-generating treadmills to brig cells
2016-03-31 20:27:43 -04:00
Fox McCloud
8f6d358ea1
Merge pull request #4018 from Tastyfish/buttbots
...
Captain Beepsky and His Merry Medibots
2016-03-31 20:07:43 -04:00
TheDZD
4a3eb6cb07
Merge pull request #4057 from Aurorablade/iconfix
...
Fixes bloated human head
2016-03-31 18:18:35 -04:00
TheDZD
8c5e73129b
Merge pull request #4056 from Tastyfish/paper-exploit
...
[s]Fixes paper limit exploit
2016-03-31 17:17:25 -04:00
Aurorablade
b35299079f
Fixes bloated human head
2016-03-31 17:01:23 -04:00
Tastyfish
bd76a0b3fb
Fixes paper limit bugs
2016-03-31 16:58:27 -04:00
Aurorablade
a278328312
reworked the event
2016-03-31 14:03:05 -04:00
Tastyfish
6a8ea815b2
Merge branch 'master' into buttbots2
...
Conflicts:
code/defines/procs/AStar.dm
code/modules/mob/living/simple_animal/bot/cleanbot.dm
code/modules/mob/living/simple_animal/bot/medbot.dm
paradise.dme
2016-03-31 13:33:46 -04:00
Fox-McCloud
2fe3b35982
Shadowling Fix
2016-03-31 08:45:31 -04:00
ProperPants
f91b5ee332
Never make commits literally five minutes after waking up.
2016-03-31 08:31:35 -04:00
ProperPants
bd4230f469
Cyborg wood was being used by drones. No longer.
2016-03-31 08:25:03 -04:00
ProperPants
0f9797a7c2
Cyborg wood is gone. I don't know why it was there in the first place.
2016-03-31 08:18:39 -04:00
Fox-McCloud
24139b8a84
Refactor of Simple Animal Eating
2016-03-31 07:15:46 -04:00
Fox McCloud
68dd38c10d
Merge pull request #4040 from Tastyfish/paichat
...
Adds chatroom to PAIs
2016-03-31 04:15:58 -04:00
Aurorablade
ebea66f7dd
heeeeeheeee
2016-03-31 02:12:57 -04:00
Aurorablade
0feac81bba
TeeHee
2016-03-31 02:10:27 -04:00
Crazylemon64
221cbc82a9
I tested this, and IPCs should go blind upon losing their head
...
I think the cause of this bug was organs not being removed on decap, which
has since been fixed
2016-03-30 21:16:42 -07:00
Fox-McCloud
d2907e3631
oh hell
2016-03-30 22:52:36 -04:00
