kevinz000
2cce781728
Merge pull request #2430
2017-08-29 22:27:24 -07:00
kevinz000
9cb65df70d
Merge pull request #2426
2017-08-29 22:27:21 -07:00
kevinz000
4b32cf2e0f
Merge pull request #2415
2017-08-29 22:27:15 -07:00
kevinz000
5c7b743cfa
Merge pull request #2405
2017-08-29 22:27:10 -07:00
kevinz000
408acdd66d
sync
2017-08-29 22:05:16 -07:00
kevinz000
9b71e967d2
Merge branch 'master' into upstream-merge-29964
2017-08-29 21:07:01 -07:00
LetterJay
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
kevinz000
df24243113
pentawew
2017-08-29 10:04:39 -07:00
kevinz000
301a581e64
sync
2017-08-29 09:41:11 -07:00
LetterJay
292f5d5d35
Update boxes.dm
2017-08-29 01:46:21 -05:00
CitadelStationBot
f191f5c827
Fixes ingredients-box sprite.
2017-08-28 14:39:03 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
27750d91d6
Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
...
[MIRROR] Removes the suppose-to-be unused shuttle wall path
2017-08-28 09:01:47 -05:00
LetterJay
3a8cf01e65
Merge pull request #2520 from Citadel-Station-13/upstream-merge-30231
...
[MIRROR] Adds logging cause of microbomb activation in admin logs
2017-08-28 08:57:36 -05:00
LetterJay
a17ed054d6
Merge pull request #2503 from Citadel-Station-13/upstream-merge-30172
...
[MIRROR] Maintains that weird entire-tcomms-setup-in-one-machine thing
2017-08-28 08:56:11 -05:00
LetterJay
2fe2912fa3
Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173
...
[MIRROR] Traitor, a traitor is a traitor.
2017-08-28 08:46:53 -05:00
CitadelStationBot
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
CitadelStationBot
bdf2fff8d9
Adds logging cause of microbomb activation in admin logs
2017-08-28 02:19:59 -05:00
CitadelStationBot
4c4bd22578
[MIRROR] Some more tweaks to Geis ( #2487 )
...
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
2017-08-27 01:36:17 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
CitadelStationBot
18904f2f0f
Maintains that weird entire-tcomms-setup-in-one-machine thing
2017-08-26 11:08:01 -05:00
CitadelStationBot
3a6a277f08
Traitor, a traitor is a traitor.
2017-08-26 11:07:24 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
3ea2288820
Fixes sounds for toy nuke, red button, and talking action figures ( #2475 )
2017-08-24 18:31:24 -07:00
CitadelStationBot
43cad07181
Transit tube pods no longer constantly suck in air ( #2478 )
2017-08-24 18:30:12 -07:00
CitadelStationBot
a6d64204ad
[MIRROR] Updates PubbyStation ( #2325 )
...
no
2017-08-22 18:20:46 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
LetterJay
f2f1474123
Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747
...
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
2017-08-21 20:32:10 -05:00
LetterJay
83f4733027
Rename _circuitboard.dm to circuitboard.dm
2017-08-21 20:01:59 -05:00
CitadelStationBot
772299445e
Makes the Ark of the Clockwork Justicar much more fancy
2017-08-20 19:55:15 -05:00
LetterJay
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
LetterJay
19b8a5a380
Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858
...
[MIRROR] Fixed sign description
2017-08-18 13:41:07 -05:00
LetterJay
db3622ca12
Update signs.dm
2017-08-18 11:18:33 -05:00
CitadelStationBot
fe567fabde
Adds RCL inhands
2017-08-17 17:21:44 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
72cf7083f6
Fixes leathercrafting recipies trying to build on the floor.
2017-08-17 09:19:09 -05:00
CitadelStationBot
c2d335b7da
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
2017-08-16 17:50:28 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
LetterJay
e5cd79a14e
Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
...
[MIRROR] Moved can_trigger_gun to item/weapon parent
2017-08-14 18:53:38 -05:00
LetterJay
6d62d51eab
Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288
...
[MIRROR] Hallucinations 3.0
2017-08-14 18:45:45 -05:00
LetterJay
300fc768a5
Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727
...
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
2017-08-14 18:37:28 -05:00
LetterJay
1bb5e19596
Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695
...
[MIRROR] flora.dm initialize hint
2017-08-14 18:36:58 -05:00
