CitadelStationBot
d8a1fc936e
[MIRROR] Stops AIs from taking actions while depowered ( #2813 )
...
* Stops AIs from taking actions while depowered
* Update ai.dm
2017-09-18 01:45:59 -05:00
CitadelStationBot
d96f3f40a5
[MIRROR] PDA game log entry contains ckey ( #2808 )
...
* PDA game log entry contains ckey
* PDA game log entry contains ckey
2017-09-17 11:58:11 -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
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
LetterJay
4ee17d5167
Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583
...
[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
KorPhaeron
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -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
vuonojenmustaturska
053b283745
Fixes initialize hints for a fair number of mobs and items
2017-09-11 12:20:19 -05:00
Leo
44e62d8016
Uplink lock codes now pick from the phonetic alphabet global list ( #30538 )
...
* Uplink lock codes now pick from the phonetic alphabet global list
* Update virus_cart.dm
2017-09-10 14:17:16 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -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
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
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
CitadelStationBot
4fbdf9851d
Fixes a drone ping issue
2017-07-21 18:19:49 -05:00
CitadelStationBot
f893863397
[MIRROR] Refactors speech/communication logging and adds coordinates to speech logs ( #1905 )
...
* Refactors speech/communication logging and adds coordinates to speech logs
* Update clockwork_slab.dm
* Delete clockwork_slab.dm.rej
* Update browserOutput.dm
* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
cdb3158af5
Fixes cartridges not linking with their host PDAs on creation
2017-07-06 09:06:29 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
45fd6a1447
Fixes PDA runtime href exploit ( #1868 )
2017-07-04 15:47:06 -07:00
Poojawa
789064a3a5
Clean up .rej files
2017-06-28 02:24:03 -05:00
LetterJay
bb916b6040
Merge branch 'master' into upstream-merge-28681
2017-06-27 06:16:34 -05:00
LetterJay
83fead2492
Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567
...
[MIRROR] Refactors PDA cartridge permissions
2017-06-27 06:14:42 -05:00
LetterJay
f85de2ddd5
Update PDA_types.dm
2017-06-27 05:58:34 -05:00
LetterJay
2158ea1e67
Merge branch 'master' into upstream-merge-28681
2017-06-27 05:14:45 -05:00
LetterJay
8875fbefc5
Delete cart.dm.rej
2017-06-27 05:12:25 -05:00
LetterJay
9d6dec8975
Update cart.dm
2017-06-27 05:12:05 -05:00
LetterJay
163bcf0189
Delete PDA.dm.rej
2017-06-27 05:11:20 -05:00
LetterJay
926589fd58
Update PDA.dm
2017-06-27 05:11:06 -05:00
LetterJay
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -05:00
LetterJay
b4473bedb2
Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382
...
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
2017-06-26 05:57:59 -05:00
CitadelStationBot
acc03ae85e
Fixes bad del runtime
2017-06-24 11:48:05 -05:00
CitadelStationBot
68d8b76dec
PDA Refactor Part 1: Phantom Blood Menace
2017-06-23 21:59:22 -05:00
LetterJay
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
CitadelStationBot
1dc24668a1
Refactors PDA cartridge permissions
2017-06-19 13:57:18 -05:00
LetterJay
a544d99f9f
cleanup and commits
2017-06-19 12:35:05 -05:00
CitadelStationBot
3f92d14933
Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
2017-06-16 20:12:20 -05:00
CitadelStationBot
4bd99124de
Adds F.R.A.M.E. cartridge
2017-06-10 12:18:31 -05:00
CitadelStationBot
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
LetterJay
f2730839d4
Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
...
[MIRROR] Refactors explosions
2017-05-30 15:15:51 -05:00
CitadelStationBot
4b9a7ce9cf
Adds AI follow links to PDA messages and holopad speech
2017-05-28 08:14:21 -05:00
CitadelStationBot
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
CitadelStationBot
1b39381ee7
Ports radios to Initialize ( #983 )
2017-05-18 12:19:55 -05:00
