344dc1a061
Merge pull request #2032 from Citadel-Station-13/upstream-merge-29257
...
[MIRROR] Fixes monkeys trying to take offhands
2017-07-15 23:19:59 -05:00
8d31153fdc
Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223
...
[MIRROR] Organ Update [Cloning isn't broken edition]
2017-07-15 23:18:53 -05:00
f634966a34
Fixes monkeys trying to take offhands
2017-07-15 22:33:14 -05:00
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
3ed842376e
Update species.dm
2017-07-15 10:06:30 -05:00
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
a0a77f5a41
Refactors screwdriver coloring to use greyscale ( #2003 )
2017-07-14 19:34:03 -07:00
6e72c48115
Added " say_mod = "chirps" " to the avian species entry to allow the say prefix to be "chirps" instead of "says" ( #2008 )
2017-07-14 19:30:17 -07:00
6d3123f63c
Readds borers ( #1999 )
...
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
3ee26917bd
Organ Update [Cloning isn't broken edition]
2017-07-14 09:00:36 -05:00
f893863397
[MIRROR] Refactors speech/communication logging and adds coordinates to speech logs ( #1905 )
...
* Refactors speech/communication logging and adds coordinates to speech logs
* Update clockwork_slab.dm
* Delete clockwork_slab.dm.rej
* Update browserOutput.dm
* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
2d4604c94b
Refactors catching to use attack_hand
2017-07-08 13:19:02 -05:00
9874978c5c
Dreams while sleeping are now slightly longer on average and will contain more possibilities ( #1940 )
2017-07-07 23:48:49 -07:00
5dd25bda95
Minor Projectile Reflection Refactor ( #1926 )
2017-07-07 10:33:59 -07:00
db9b069075
re-adds headpatting ( #1903 )
2017-07-06 10:29:58 -07:00
21878a77f0
Fixes heartbeat sounds playing indefinitely in certain cases
2017-07-06 08:26:23 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
a1ff07ed1f
[MIRROR] Organs for catgirls ( #1457 )
...
* Organs for catgirls
* Delete tgstation.dme.rej
* Update tgstation.dme
2017-07-05 09:12:59 -05:00
ac16176c20
Fixes deathgasping while being cloned ( #1852 )
2017-07-01 21:20:47 -07:00
735b25c6e3
Merge branch 'master' into upstream-merge-28916
2017-06-30 10:36:11 -05:00
cc6f626047
Update life.dm
2017-06-30 09:59:53 -05:00
c4e8b87f44
Heartbeat fix
2017-06-30 09:18:18 -05:00
98ff55f786
Adds heartbeats
2017-06-28 14:01:39 -05:00
f1937eb1fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-06-26 06:14:55 -05:00
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -05:00
bef1ffc086
Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit
2017-06-24 14:49:11 -05:00
f919e995dc
Stamina projectiles no longer set off grenades and flamethrowers
2017-06-22 11:00:13 -05:00
989b991b05
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 22:06:18 -05:00
5e759fd792
Update examine.dm
2017-06-19 15:47:08 -05:00
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
a544d99f9f
cleanup and commits
2017-06-19 12:35:05 -05:00
078824266e
Tablets with IDs in them now show the ID's name on examine
2017-06-17 16:56:48 -05:00
6ec1b66a9d
Refactors soundbang_act to use adjustEarDamage ( #1467 )
2017-06-17 13:37:28 -07:00
ef07d6b9ee
Makes Zombies 2 spooky ( #1583 )
2017-06-17 13:29:23 -07:00
7162120fc4
Adds screaming for burns ( #1645 )
2017-06-17 13:25:55 -07:00
a1bd66ef8b
Merge pull request #1634 from Citadel-Station-13/upstream-merge-28414
...
[MIRROR] Adds onions
2017-06-17 10:04:59 -05:00
f86bda7cda
Adds onions
2017-06-16 16:22:38 -05:00
9bd98194b2
Vomit fix
2017-06-16 15:19:26 -05:00
67770a25be
final commit(?)
2017-06-14 09:54:14 -05:00
28d726d1af
Still need to fix the head.
2017-06-14 04:54:28 -05:00
226345d82a
upstream-merge-28109
...
upstream-merge-28352
2017-06-13 01:10:21 -05:00
4624ec7e04
upstream-merge-27899
2017-06-11 00:09:55 -05:00
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
9725329268
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-07 03:06:15 -05:00
9f02ba1245
Refactors another spawn cooldown var ( #1393 )
2017-06-04 09:04:49 -07:00
LetterJay