LetterJay
cf37555c4d
Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302
...
[MIRROR] Move shuttleRotate into the shuttle module
2017-10-05 09:13:41 -04:00
oranges
cedb56af1b
Merge pull request #31302 from ninjanomnom/shuttle-rotation
...
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
Leo
39cf9bb7a0
Merge pull request #31286 from KorPhaeron/ismachinery
...
ismachinery define
2017-10-04 19:26:38 -05:00
LetterJay
0206e3f775
Update particle.dm
2017-10-03 18:48:18 -05:00
MoreRobustThanYou
f78d0988ab
Blobs now take damage from particle accelerators
2017-10-03 18:12:52 -05:00
MoreRobustThanYou
f870b66b31
Makes antimatter code less shit ( #31219 )
...
* Antimatter shielding that can't find a control unit won't delete itself anymore
* Update shielding.dm
* Update shielding.dm
* Update shielding.dm
* Update shielding.dm
* Update shielding.dm
* Update shielding.dm
* gthruhru
* thanks Antur
2017-10-03 04:40:47 -05:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
LetterJay
f538d91fe8
Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145
...
[MIRROR] Fixes aliums being able to attack the SM crystal
2017-10-01 16:31:44 -04:00
ShizCalev
770a0a1154
Fixes aliums being able to attack the SM crystal
2017-10-01 05:04:30 -05:00
Leo
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
LetterJay
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
LetterJay
10b530920b
Merge pull request #3015 from Citadel-Station-13/upstream-merge-31111
...
[MIRROR] Fixes SM shard extraction
2017-09-30 12:57:33 -04:00
ShizCalev
c54ea1b9bf
Fixes SM shard extraction ( #31111 )
...
* Fixes SM shard extraction
* Space-OSHA called. They want to have a word.
2017-09-29 18:43:41 -05:00
Jordan Brown
cd334646c3
Fixes PA Href Issue
2017-09-29 17:23:59 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
AnturK
fd0bc465cc
Refactors cinematics.
2017-09-26 04:20:59 -05:00
oranges
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
CitadelStationBot
a286d0c313
[MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction ( #2875 )
...
* Gives engineering cyborgs an item they can use in place of circuits for basic construction
* fixes
2017-09-22 23:35:54 -05:00
oranges
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
CitadelStationBot
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
Poojawa
8406baebbe
Makes APC cell_type actually pick a cell ( #2747 )
...
* Ports TG#30327
* Update apc.dm
* maybe delta can be fully copies over, yes?
2017-09-13 19:57:21 -05:00
CitadelStationBot
083fc1a7b4
[MIRROR] Standardized power displays ( #2539 )
...
* Standardized power displays
* Update tgui.js
* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
LetterJay
6951e39d13
Update apc.dm
2017-09-11 13:10:54 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
ExcessiveUseOfCobblestone
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
AnturK
df3b4c10bc
Fixes containment field CanPass
2017-09-07 10:34:11 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
LetterJay
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
CitadelStationBot
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
CitadelStationBot
4a456fd2c7
Fixes APC pixel shift being off
2017-08-28 02:20:25 -05:00
CitadelStationBot
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07: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
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
LetterJay
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -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
68830dac71
Changes smes, cells, cell charger, terminals and apcs icons
2017-08-16 20:02:24 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
3b1a0a0dc0
Fixes Singulo, Tesla, Reality Breaks, & Narsie being frozen by freon
2017-08-15 05:11:08 -05:00
CitadelStationBot
0e7b9a008e
Ports a slightly edited version of Eris APC sprites
2017-08-13 17:54:27 -05:00
CitadelStationBot
4d19a89519
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 19:24:19 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
