a12a12b550
comma splice and ellipsis grammar fix ( #33040 )
...
* :*)
* i think this fixes splice
2017-11-24 15:21:11 -06:00
ad3608caeb
Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699
...
[MIRROR] Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
2017-11-23 01:03:38 +00:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
c97e8805f6
Update hostile.dm
2017-11-22 17:53:36 -05:00
7c1fe79635
Merge pull request #32943 from ShizCalev/alium-softcrit-sprite
...
Fixes aliums showing wrong sprite in softcrit
2017-11-22 15:37:57 -06:00
8458dc952c
Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
2017-11-22 15:24:21 -06:00
38c45fb479
Refactor chasm paths to be more sane ( #32701 )
...
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.
Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
2017-11-22 03:30:49 -06:00
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
aedf16a76e
merges #4011
2017-11-21 15:07:31 -05:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
15165d970d
Update inventory.dm
2017-11-20 22:29:55 -05:00
3aefa4a907
Update cameranet.dm
2017-11-20 22:29:15 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
61501988cb
Merge pull request #32871 from AnturK/orbitclean
...
Transfers orbiting ghosts on most common transforms
2017-11-19 17:13:08 -06:00
e3036f6eae
fix 'cannot scream while unconscious' bug ( #32814 )
...
* fix 'cannot scream while unconscious' bug
fixes a bug where it tells you that you can't scream while unconscious while on fire (experienced on Bagil when a plasma fire happened at endround shuttle)
* Update species.dm
* sanitize code
* add the comment back so people know what it doin
* change operator
other one wouldn't work with the fix, the screaming is supposed to happen while you're in crit
2017-11-18 13:52:36 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
9e78bcd8f9
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
...
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
2017-11-18 05:29:32 +00:00
591efe27a3
Update robot_modules.dm
2017-11-18 00:19:35 -05:00
d202867730
Update carbon.dm
2017-11-17 23:23:13 -05:00
f1818eb11b
Update death.dm
2017-11-17 23:22:02 -05:00
0beef30fb7
Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! ( #3993 )
2017-11-17 19:02:40 -08:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
706e691fef
Merge pull request #3981 from Citadel-Station-13/upstream-merge-32778
...
[MIRROR] Makes you turn when pulling and adds sound to rolling bed and chair
2017-11-17 04:52:22 +00:00
792f16ebd6
Merge pull request #3969 from Citadel-Station-13/upstream-merge-32622
...
[MIRROR] Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-17 04:49:10 +00:00
df514d7411
Makes you turn when pulling and adds sound to rolling bed and chair ( #32778 )
...
* Makes you turn at what you are pulling and adds sound to rolling bed and chair
* ShizCalev's sound
2017-11-16 18:44:05 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
952fa2a0f2
Fix conflicts between helmet/mech HUDs and HUD glasses
2017-11-16 15:39:15 -06:00
2099954f7a
Merge pull request #32744 from JJRcop/last_res--oh
...
Fixes changeling egg when slug destroyed
2017-11-16 15:35:56 -06:00
805eaedd5a
Update lizardpeople.dm
2017-11-16 12:42:38 -05:00
a488e7cf07
Update lizardpeople.dm
2017-11-16 12:38:11 -05:00
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
2715fd1b6c
Merge pull request #3950 from deathride58/slimernosliming
...
Re-disables slimeperson splitting
2017-11-15 10:54:51 -06:00
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
46ba6cbc7b
Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620
...
[MIRROR] Greatly increases the performance of station-ending plasma fires
2017-11-15 10:40:40 -06:00
3c28ea5426
Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277
...
[MIRROR] Removes golem debug code that spams world
2017-11-15 10:30:31 -06:00
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
f1274b41f2
redisables slime splitting
2017-11-14 19:27:19 -05:00
0885c57b39
Update mob.dm
2017-11-14 16:10:46 -06:00
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
157998e974
Greatly increases the performance of station-ending plasma fires
2017-11-14 13:51:45 -06:00
2fc1e5c8e5
More nuanced damage examination ( #32707 )
...
* More nuanced damage examinations
* Tweaking examination values
* Redundancy Removal
2017-11-14 13:48:20 -06:00
ab42a6242f
Merge pull request #3920 from Citadel-Station-13/LetterJay-patch-2
...
Fixes flavor text on examine
2017-11-13 13:14:25 -06:00
d983c7d928
Update examine.dm
2017-11-13 11:54:18 -06:00
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
f46db62f48
Update examine.dm
2017-11-13 11:49:47 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
7c45ae5cb7
Adds Extended Drill Hair
2017-11-13 03:12:44 -06:00
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
Armhulen