62f633a1ad
Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha
2017-07-19 11:19:35 -05:00
95d2969339
Merge pull request #2068 from Citadel-Station-13/upstream-merge-29283
...
[MIRROR] Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils
2017-07-19 05:34:56 -05:00
7cbdc0e2ae
Merge pull request #2070 from Citadel-Station-13/upstream-merge-29356
...
[MIRROR] Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 05:34:24 -05:00
0b7d08d5ac
Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 04:05:53 -05:00
5801f6211f
Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils
2017-07-18 18:45:30 -05:00
1ebdf19cdb
Refactor Lung Handling
2017-07-18 09:59:09 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
228f539eca
Prevents the anomalous crystal from making fantasy into reality
2017-07-18 06:46:00 -05:00
0ce34e08b6
Augment Styles/Changes
2017-07-18 06:45:44 -05:00
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
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
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -07:00
099b908d64
Fixes traitor holoparasites ( #1904 )
...
* fixes holoparasites
* adds #1051 and #1066
* as it turns out I'm blind
* fixes line 500 indentation
2017-07-15 11:48:56 -07:00
b025182955
Possibly fix player_list sometimes having a null ( #2022 )
2017-07-15 11:45:33 -07:00
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07: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
df26bdd9cf
cleanup
2017-07-14 10:22:43 -05:00
3ee26917bd
Organ Update [Cloning isn't broken edition]
2017-07-14 09:00:36 -05:00
9d3c4d4702
Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215
...
[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46: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
85fa3c0bee
[MIRROR] Refactors flightsuit code to hopefully be less dumb ( #1975 )
...
* Refactors flightsuit code to hopefully be less dumb
* Update flightsuit.dm
* Delete flightsuit.dm.rej
* Delete objs.dm.rej
* Delete mob_movement.dm.rej
* Delete carbon_movement.dm.rej
* Update mob_movement.dm
* Update flightsuit.dm
* Update mob_movement.dm
* fix
2017-07-12 05:24:50 -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
ff0c889a29
Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140
...
[MIRROR] Removes now-unnecessary obj_integrity definitions
2017-07-09 23:06:13 -05:00
08e044a522
Merge pull request #1960 from Citadel-Station-13/upstream-merge-29141
...
[MIRROR] Necropolis curse mobs no longer fall into chasms
2017-07-09 23:05:53 -05:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
b24f98c1e2
Necropolis curse mobs no longer fall into chasms
2017-07-09 19:44:43 -05:00
0f6ff169aa
Allows drones to switch to/from harm intent
2017-07-09 19:44:40 -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
7b52f001ed
Adding the mook/wanderer mob for planetstation
2017-07-07 14:16:26 -05:00
5dd25bda95
Minor Projectile Reflection Refactor ( #1926 )
2017-07-07 10:33:59 -07:00
6145b939fa
Fix incorrect call to do_attack_animation ( #1920 )
2017-07-07 04:47:28 -07:00
db9b069075
re-adds headpatting ( #1903 )
2017-07-06 10:29:58 -07:00
dd70580a72
Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992
...
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 11:22:24 -05:00
c62086af13
Merge pull request #1900 from Citadel-Station-13/upstream-merge-28877
...
[MIRROR] Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut.
2017-07-06 10:56:52 -05:00
223c95940d
Merge pull request #1898 from Citadel-Station-13/upstream-merge-29008
...
[MIRROR] Cleans up posibrain code
2017-07-06 10:52:06 -05:00
67194851a8
Merge pull request #1897 from Citadel-Station-13/upstream-merge-29032
...
[MIRROR] Tweaks the blood-drunk miner
2017-07-06 10:51:39 -05:00
CitadelStationBot