Mercenaryblue
67a91aaf41
Hotel Security spellchecked ( #32313 )
...
* spellcheck
interests
* spellcheck
2017-11-02 13:29:15 -05:00
ACCount
cfaa6a9cd5
Reflector fixes and improvements
2017-10-31 21:01:45 -05:00
LetterJay
761acb5084
Merge pull request #3706 from Citadel-Station-13/upstream-merge-32134
...
[MIRROR] Makes rollerbeds normal-sized items
2017-10-31 03:02:43 -04:00
Jordan Brown
f6ebb15fbd
Merge pull request #32134 from Anonmare/patch-8
...
Makes rollerbeds normal-sized items
2017-10-30 15:09:49 -05:00
Jordan Brown
b6343c813b
Merge pull request #32215 from kevinz000/patch-363
...
fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
2017-10-30 14:37:37 -05:00
Michiyamenotehifunana
d0a28fcd62
NERF EVERYTHING
...
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
LetterJay
1fe4eb7d88
Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns
...
Recolorable Guns and more ballistics for Security
2017-10-29 23:43:20 -04:00
LetterJay
f900f2ea9a
Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
...
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
LetterJay
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
Jordan Brown
82c388b3e8
Makes thermite a component
2017-10-27 17:36:38 -05:00
oranges
28053a603a
Merge pull request #31991 from ShizCalev/reflector-stack-fix
...
fixes reflectors dropping extra mats
2017-10-26 05:03:48 -05:00
vuonojenmustaturska
1794018ae1
Removes mob.lastattacked and replaces lastattacker with a string
2017-10-22 11:29:35 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5
Allows species to be blocked from ever being roundstart, can now choose your Halloween species
2017-10-20 10:11:35 -05:00
LetterJay
fe05d8aaaf
Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754
...
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
2017-10-19 09:24:04 -04:00
LetterJay
e876293476
Merge pull request #3499 from Citadel-Station-13/upstream-merge-31773
...
[MIRROR] Showers clean contamination and make sound
2017-10-19 09:20:02 -04:00
vuonojenmustaturska
7045809aa2
Stops manned turrets from firing when the user unbuckles themselves from the turret ( #31754 )
...
* The clown is drunk, and the cards of death wait on him
* Update power.dm
2017-10-19 05:41:41 -05:00
Michiyamenotehifunana
5071b3438c
RECOLORABLE GUN MEMES
...
Includes new ammo types, recolorable guns, partially recolorable guns, non-recolorable guns, and implementations into the map.
2017-10-19 18:30:44 +08:00
Emmett Gaines
ee3d18fe58
Showers clean contamination and make sound ( #31773 )
...
* fucking showers
* cleanup
2017-10-19 03:29:08 -05:00
jughu
25c37ac9bb
Removes crewpinpointer from wardens locker ( #31711 )
...
* Update security.dm
* Update security.dm
2017-10-19 02:02:25 -05:00
Ashe Higgs
13d8414369
Fixes being able to pick up brass chairs ( #31810 )
2017-10-17 15:33:23 -05:00
LetterJay
24631746d4
Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707
...
[MIRROR] Restores security bombsuit & white bombsuit
2017-10-16 14:12:28 -04:00
LetterJay
568ed91f28
Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
...
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
LetterJay
4b6ebe3fa3
Merge pull request #3428 from Citadel-Station-13/upstream-merge-31710
...
[MIRROR] Removes mapping error bandaid
2017-10-16 07:29:20 -04:00
LetterJay
a703a599fa
Merge pull request #3413 from Citadel-Station-13/upstream-merge-31695
...
[MIRROR] Makes directional windows only block air if anchored
2017-10-16 07:08:11 -04:00
kevinz000
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
Jordan Brown
baf8b578f5
Removes mapping error bandaid ( #31710 )
...
* Removes mapping error bandaid
* Update conversion code
2017-10-15 21:02:02 -05:00
LetterJay
b5f3dd3445
Update utility_closets.dm
2017-10-15 15:09:37 -05:00
Jordan Brown
742669cc62
Restores security bombsuit & white bombsuit
2017-10-15 11:33:42 -05:00
Jordan Brown
e6def19aa2
Merge pull request #31695 from ninjanomnom/directional-windows
...
Makes directional windows only block air if anchored
2017-10-15 11:33:33 -05:00
Jordan Brown
4e4f2fa19d
Merge pull request #31713 from vuonojenmustaturska/initializefixesoct
...
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-15 11:32:05 -05:00
LetterJay
6bcec20501
Merge pull request #3396 from Citadel-Station-13/upstream-merge-31679
...
[MIRROR] Adds petcollars to the cmo, captain, and bartender's locker
2017-10-15 10:21:11 -04:00
LetterJay
b02e9c6a90
Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731
...
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
2017-10-15 10:20:04 -04:00
LetterJay
f68230c93c
Update job_closets.dm
2017-10-15 06:58:52 -05:00
jughu
4b17b4a9a3
Adds petcollars to the cmo, captain, and bartender's locker
2017-10-14 18:01:05 -05:00
Emmett Gaines
24b9d4b9f4
Fixes camera mobs becoming contaminated and other tweaks ( #31731 )
2017-10-14 17:40:34 -05:00
vuonojenmustaturska
1831bc8ea9
Allows mobs to get shocked when they smash things ( #31677 )
...
also fixes an unrelated runtime involving magillitis
2017-10-14 15:19:37 -05:00
LetterJay
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
LetterJay
c28932e4d4
Update displaycase.dm
2017-10-13 22:57:31 -05:00
LetterJay
732dc95c14
Update kitchen_spike.dm
2017-10-13 22:32:32 -05:00
LetterJay
c5abf8b01f
Update hivebot.dm
2017-10-13 22:32:10 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
LetterJay
f0fc11f5b5
Merge pull request #3273 from Citadel-Station-13/upstream-merge-31493
...
[MIRROR] Fixes closet layer
2017-10-10 05:55:28 -04:00
AnturK
344238a401
Fixes closet layer ( #31493 )
...
* Fixes closet layer
* Actually this might be better.
2017-10-10 03:20:53 -05:00
Tad Hardesty
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
LetterJay
86edafb132
lol
2017-10-09 01:06:50 -05:00
