deathride58
|
5d2c5add1f
|
Update color.dm
|
2017-11-22 14:50:37 -05:00 |
|
deathride58
|
b24c9335b3
|
Update jobs.dm
|
2017-11-22 14:48:35 -05:00 |
|
deathride58
|
5e6e725666
|
Update color.dm
|
2017-11-22 14:47:15 -05:00 |
|
deathride58
|
2dbe3e3b82
|
Update chameleon.dm
|
2017-11-22 14:46:06 -05:00 |
|
ShizCalev
|
6ab499b57b
|
Fixes bartender suit having an adjust state
|
2017-11-22 12:40:32 -06:00 |
|
jammer312
|
cf10130b21
|
Conjuration spells fix (#32951)
* conjure spells fix
* added newline at end of file
|
2017-11-21 22:30:05 -06:00 |
|
deathride58
|
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 |
|
deathride58
|
51a7c4a543
|
Merge pull request #4057 from deathride58/manualmirrors2
Manually mirrors #32838 and #32462 from upstream
|
2017-11-21 20:00:18 +00:00 |
|
deathride58
|
4b284f2e0d
|
Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773
[MIRROR] Integrated circuit fixes and code improvements
|
2017-11-21 19:59:38 +00:00 |
|
deathride58
|
c2b27ebfa4
|
merges #3837
|
2017-11-21 14:45:44 -05:00 |
|
deathride58
|
9f80325c52
|
Update power.dm
|
2017-11-21 14:20:03 -05:00 |
|
deathride58
|
e5cdbe29cc
|
Update printer.dm
|
2017-11-21 14:18:42 -05:00 |
|
deathride58
|
ddbb5c34d4
|
manual mirrors
|
2017-11-21 14:06:28 -05:00 |
|
Leo
|
f668f36156
|
Merge pull request #32928 from ShizCalev/space-leg-slowdown
Fixes humans missing legs moving slower in zero-g enviroments
|
2017-11-21 04:01:56 -06:00 |
|
ACCount
|
8a64287249
|
Integrated circuit fixes and code improvements
|
2017-11-21 03:04:17 -06:00 |
|
deathride58
|
2abd06e25e
|
Merge pull request #4028 from Citadel-Station-13/upstream-merge-32862
[MIRROR] Rat Kebabs
|
2017-11-21 04:39:41 +00:00 |
|
deathride58
|
d2b251d23c
|
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
[MIRROR] Cleans up unused code
|
2017-11-21 04:15:11 +00:00 |
|
deathride58
|
0ed8bf3237
|
Update security_levels.dm
|
2017-11-20 22:33:12 -05:00 |
|
deathride58
|
3b0a71006c
|
Update experimentor.dm
|
2017-11-20 22:32:20 -05:00 |
|
deathride58
|
15165d970d
|
Update inventory.dm
|
2017-11-20 22:29:55 -05:00 |
|
deathride58
|
3aefa4a907
|
Update cameranet.dm
|
2017-11-20 22:29:15 -05:00 |
|
deathride58
|
6b8d256c21
|
Merge pull request #4030 from Citadel-Station-13/upstream-merge-32885
[MIRROR] tweak skateboard crashes, gives brain damage
|
2017-11-21 03:27:16 +00:00 |
|
deathride58
|
b284385b20
|
Merge pull request #4042 from Citadel-Station-13/upstream-merge-32908
[MIRROR] Fixes the RD being able to kill the bar drone with his console
|
2017-11-21 03:26:26 +00:00 |
|
AnturK
|
70c7996986
|
Fixes abductor teams getting assigned to same pod (#32859)
* Fixes abductors getting assigned to same team
* Remove explicit null return
|
2017-11-20 19:36:10 -06:00 |
|
KorPhaeron
|
8242b08d28
|
Bar Drone can't be remotely detonated (#32908)
|
2017-11-20 13:40:23 -06:00 |
|
deathride58
|
a5ed407bc5
|
Merge pull request #4034 from Citadel-Station-13/upstream-merge-32890
[MIRROR] Makes drinking glasses smash when thrown
|
2017-11-20 19:07:25 +00:00 |
|
deathride58
|
34b7c7da81
|
Merge pull request #4031 from Citadel-Station-13/upstream-merge-32797
[MIRROR] Refactor ladders so that they actually work
|
2017-11-20 19:06:30 +00:00 |
|
deathride58
|
8cbd704988
|
Update footprints_and_rag.dm
|
2017-11-20 13:43:48 -05:00 |
|
Jordan Brown
|
2498e1ddc0
|
Cleans up unused code
|
2017-11-20 10:14:32 -06:00 |
|
ACCount
|
0fa731cec0
|
Fixes two refactor-caused bugs in disposals (#32892)
|
2017-11-20 02:47:35 -06:00 |
|
ShizCalev
|
831dde525e
|
Makes drinking glasses smash when thrown
|
2017-11-20 02:45:22 -06:00 |
|
Tad Hardesty
|
5560a557e7
|
Refactor ladders so that they actually work (#32797)
|
2017-11-20 02:05:52 -06:00 |
|
checkraisefold
|
080aa1750e
|
tweak skateboard crashes, gives brain damage (#32885)
* tweak skateboard crashes
* helmet stops brain damage
* add hardhat
|
2017-11-20 01:50:24 -06:00 |
|
deathride58
|
44287392a4
|
Merge pull request #4022 from Citadel-Station-13/upstream-merge-32889
[MIRROR] Makes some turning procs consistently turn clockwise
|
2017-11-20 05:48:20 +00:00 |
|
deathride58
|
fd094bfd19
|
Merge pull request #4029 from Citadel-Station-13/upstream-merge-32853
[MIRROR] Fixes purple bartender clothes
|
2017-11-20 05:19:42 +00:00 |
|
deathride58
|
d8e1562fcf
|
Merge pull request #3995 from deathride58/manualsyncsreeEEEE
Manual map syncs + manual mirrors of missed upstream map PRs
|
2017-11-20 05:12:06 +00:00 |
|
deathride58
|
4687c8498a
|
Merge pull request #4023 from Citadel-Station-13/upstream-merge-32886
[MIRROR] Fixes incorrect to_chat usage
|
2017-11-20 05:06:25 +00:00 |
|
deathride58
|
d200169b0c
|
Merge pull request #4018 from Citadel-Station-13/upstream-merge-32869
[MIRROR] Fixes whiteship ruin board swap
|
2017-11-20 05:01:13 +00:00 |
|
Jordie
|
5bb8a1b962
|
Merge pull request #32853 from KorPhaeron/purple
Fixes purple bartender clothes
|
2017-11-19 22:55:03 -06:00 |
|
Jordie
|
f162a48472
|
Rat Kebabs
|
2017-11-19 22:49:46 -06:00 |
|
Jordie
|
aea39fdd49
|
Merge pull request #32886 from ShizCalev/to_chat
Fixes incorrect to_chat usage
|
2017-11-19 22:26:28 -06:00 |
|
Jordie
|
752bc654ae
|
Makes some turning procs consistently turn clockwise
|
2017-11-19 22:25:17 -06:00 |
|
ShizCalev
|
ede0a105e5
|
Fixes whiteship ruin board swap (#32869)
|
2017-11-19 21:04:11 -06:00 |
|
Leo
|
61501988cb
|
Merge pull request #32871 from AnturK/orbitclean
Transfers orbiting ghosts on most common transforms
|
2017-11-19 17:13:08 -06:00 |
|
deathride58
|
3dcd88b975
|
Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788
[MIRROR] Fixes inconsistencies w/ energy descriptions
|
2017-11-19 05:16:15 +00:00 |
|
deathride58
|
6a05a54c96
|
Update cell.dm
|
2017-11-18 23:31:32 -05:00 |
|
deathride58
|
75adfdc245
|
Merge pull request #4008 from Citadel-Station-13/upstream-merge-32814
[MIRROR] fix 'cannot scream while unconscious' bug
|
2017-11-19 04:29:07 +00:00 |
|
deathride58
|
68d9e90f96
|
Merge pull request #4005 from Citadel-Station-13/upstream-merge-32811
[MIRROR] Fix for list pin in integrated circuits
|
2017-11-19 04:27:43 +00:00 |
|
deathride58
|
a00a82c1a2
|
Merge pull request #4002 from Citadel-Station-13/upstream-merge-32840
[MIRROR] Cleans up unused circuitry code
|
2017-11-19 04:25:43 +00:00 |
|
ShizCalev
|
c2000cc31a
|
Fixes inconsistencies w/ energy descriptions
|
2017-11-18 14:18:14 -06:00 |
|