 deathride58
|
3bff5f4cd6
|
Update PDA_types.dm
|
2017-12-05 17:43:52 -05:00 |
|
|
deathride58
|
cf23ed4e14
|
Update mech_fabricator.dm
|
2017-12-05 17:42:56 -05:00 |
|
|
Jordan Brown
|
e1f658a50d
|
Removes ComponentActivated in favor of callbacks
|
2017-12-05 15:42:47 -06:00 |
|
|
deathride58
|
a6aa181161
|
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
[MIRROR] Moves some machine sprites into /machines/ folder
|
2017-12-05 20:37:30 +00:00 |
|
|
ACCount
|
435e46e407
|
Moves some machine sprites into /machines/ folder
|
2017-12-05 03:24:03 -06:00 |
|
|
oranges
|
4204c889ed
|
Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
|
2017-12-05 03:23:06 -06:00 |
|
|
deathride58
|
379f73d1e1
|
Merge branch 'master' into upstream-merge-32249
|
2017-12-04 23:15:38 +00:00 |
|
|
deathride58
|
858a9bf428
|
Merge pull request #4074 from Citadel-Station-13/upstream-merge-32624
[MIRROR] [READY]Refactors uplinks to a component!
|
2017-12-04 23:12:45 +00:00 |
|
|
deathride58
|
21d5e8999c
|
Merge branch 'master' into upstream-merge-32624
|
2017-12-04 17:12:53 -05:00 |
|
|
deathride58
|
64aadb868e
|
Merge branch 'master' into upstream-merge-33213
|
2017-12-04 21:39:30 +00:00 |
|
|
deathride58
|
6dded415b8
|
Merge pull request #4184 from Citadel-Station-13/upstream-merge-33184
[MIRROR] Plushie relationships!
|
2017-12-04 21:32:16 +00:00 |
|
|
deathride58
|
4ddbe28068
|
Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868
[MIRROR] Holorecord disks.
|
2017-12-04 21:29:44 +00:00 |
|
|
deathride58
|
1a32bdc053
|
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
[MIRROR] Datumizes saymodes
|
2017-12-04 21:19:53 +00:00 |
|
|
deathride58
|
ca14e25639
|
Merge pull request #4210 from Citadel-Station-13/upstream-merge-33185
[MIRROR] Adds quiet argument to playsound.
|
2017-12-04 21:09:24 +00:00 |
|
|
deathride58
|
9d87f5fd9f
|
Merge pull request #4207 from Citadel-Station-13/upstream-merge-33225
[MIRROR] Fixes mechs needing no fuel to repair, and tweaks repair messages
|
2017-12-04 21:07:25 +00:00 |
|
|
AnturK
|
2587b99a69
|
Adds quiet argument to playsound. (#33185)
* Adds quiet argument to playsound.
* argument name change
|
2017-12-04 05:28:43 -06:00 |
|
|
AnturK
|
1cc3e33714
|
Holorecord disks.
|
2017-12-04 05:14:13 -06:00 |
|
|
Ashe Higgs
|
3689b3d5fd
|
Mechs now require fuel to repair (#33225)
|
2017-12-04 04:55:25 -06:00 |
|
|
Jordan Brown
|
2393b7759b
|
People jitter when revived by defibs
|
2017-12-03 20:19:44 -06:00 |
|
|
deathride58
|
d9ca1d6831
|
Merge pull request #4201 from Citadel-Station-13/upstream-merge-33224
[MIRROR] Plasma statues get fixed
|
2017-12-03 23:30:01 +00:00 |
|
|
deathride58
|
51f07eb65a
|
Merge pull request #4191 from Citadel-Station-13/upstream-merge-33189
[MIRROR] Fixes spelling error in opened cryogenic pods.
|
2017-12-03 23:21:28 +00:00 |
|
|
kevinz000
|
66c66f0bd7
|
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
|
2017-12-03 15:33:29 -06:00 |
|
|
Robustin
|
a575e2668d
|
Plasma statues get fixed (#33224)
* Plasma statues fix
* Actually a fix
* brackets
|
2017-12-03 13:16:45 -06:00 |
|
|
MoreRobustThanYou
|
29ba71765c
|
Datumizes saymodes
|
2017-12-03 12:56:03 -06:00 |
|
|
Ashe Higgs
|
5621507b4a
|
Adds emergency lights, built into light fixtures
|
2017-12-03 12:54:48 -06:00 |
|
|
LetterJay
|
6217206bae
|
Merge pull request #4189 from Citadel-Station-13/upstream-merge-33180
[MIRROR] cardboard no longer can damage you
|
2017-12-03 06:16:00 -06:00 |
|
|
LetterJay
|
c5f0b380cd
|
Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157
[MIRROR] Clean up some loc assignments
|
2017-12-03 06:14:34 -06:00 |
|
|
LetterJay
|
b2f1359795
|
Merge pull request #4185 from Citadel-Station-13/upstream-merge-33197
[MIRROR] Fixes syndieborg spawner
|
2017-12-03 06:14:25 -06:00 |
|
|
LetterJay
|
dd99e8305a
|
Update plushes.dm
|
2017-12-03 06:14:14 -06:00 |
|
|
BeeSting12
|
8017aac116
|
Fixes spelling error in opened cryogenic pods. (#33189)
|
2017-12-02 09:45:07 -06:00 |
|
|
Leo
|
4723a1813b
|
Merge pull request #33180 from praisenarsie/patch-13
cardboard no longer can damage you
|
2017-12-02 09:44:47 -06:00 |
|
|
vuonojenmustaturska
|
9f9582ba5e
|
Clean up some loc assignments (#33157)
|
2017-12-02 09:44:20 -06:00 |
|
|
AnturK
|
18c01d88c5
|
Fixes syndieborg spawner
|
2017-12-02 09:44:11 -06:00 |
|
|
CosmicScientist
|
7be54897b2
|
Plushie relationships!
|
2017-12-02 09:44:02 -06:00 |
|
|
Robustin
|
786c26fa97
|
Ratvar will now bitchslap BOH babies (#33159)
* Singuloproofing Reebe
* Message reformatted
* Inconsistent Indentification
* user is now living so we can knock them down
|
2017-12-01 11:58:30 -06:00 |
|
|
deathride58
|
834102c7d5
|
Merge pull request #4169 from Citadel-Station-13/upstream-merge-33149
[MIRROR] Removes an unused proc
|
2017-12-01 02:02:11 +00:00 |
|
|
Jordan Brown
|
d19c41cf64
|
Do this (#33149)
|
2017-11-30 17:01:20 -06:00 |
|
|
Leo
|
6d8d9802d4
|
Merge pull request #33153 from AnturK/adv_cam_cleanup
Fixes some advanced camera issues
|
2017-11-30 17:00:46 -06:00 |
|
|
deathride58
|
32f694943b
|
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
[MIRROR] Removes mass-spectrometers
|
2017-11-30 04:45:13 +00:00 |
|
|
deathride58
|
4eceef7693
|
Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967
[MIRROR] Added bot path data huds
|
2017-11-30 04:34:25 +00:00 |
|
|
deathride58
|
9458087cfa
|
Update scanners.dm
|
2017-11-28 22:31:54 -05:00 |
|
|
deathride58
|
34c9105396
|
Merge pull request #4165 from Citadel-Station-13/upstream-merge-33129
[MIRROR] Adds a new wizard magic suicide.
|
2017-11-29 03:29:37 +00:00 |
|
|
deathride58
|
6c6149e1af
|
Merge pull request #4164 from Citadel-Station-13/upstream-merge-33127
[MIRROR] Fixes twohanded weapons showing outdated icons when equipped to the back
|
2017-11-29 03:29:17 +00:00 |
|
|
deathride58
|
0e77256e81
|
Merge pull request #4163 from Citadel-Station-13/upstream-merge-33138
[MIRROR] Fixes piano in the big band music crate
|
2017-11-29 03:28:53 +00:00 |
|
|
deathride58
|
5e2ca3235d
|
Merge pull request #4160 from Citadel-Station-13/upstream-merge-33112
[MIRROR] Fixes devilstuff
|
2017-11-29 03:26:51 +00:00 |
|
|
deathride58
|
3f29fb59e1
|
Merge pull request #4159 from Citadel-Station-13/upstream-merge-33140
[MIRROR] Check door for (welded) upon closing
|
2017-11-29 03:26:03 +00:00 |
|
|
Shadowflame909
|
5bc059fbc8
|
Update artefact.dm (#33129)
Beep Beep more hard to get suicides are fun!
|
2017-11-28 19:06:24 -06:00 |
|
|
ShizCalev
|
47e0943c9c
|
Fixes twohanded weapons showing outdated icons (#33127)
|
2017-11-28 19:04:09 -06:00 |
|
|
ShizCalev
|
48c66093fc
|
Fixes big band music crate (#33138)
|
2017-11-28 19:02:54 -06:00 |
|
|
Jordan Brown
|
87c16e3939
|
Merge pull request #33112 from AnturK/devilfix
Fixes devilstuff
|
2017-11-28 06:29:25 -06:00 |
|