92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
8662e4a53c
Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050
...
[MIRROR] Mi-go
2017-12-18 15:20:00 -06:00
8a0aa32335
Mi-go
2017-12-17 04:11:01 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
a3ee534eb8
Merge pull request #33512 from AnturK/exiledmob
...
Fixes gateway ignoring exile implants in simple mobs
2017-12-14 22:34:55 -06:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
0496cc9bc7
Adds a medal for getting to the end of the secret tile dialog. ( #33116 )
...
* Adds medal for reaching the end of the secret room panel list
* fix
2017-12-08 10:34:35 -06:00
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
5560a557e7
Refactor ladders so that they actually work ( #32797 )
2017-11-20 02:05:52 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
495632eac2
Adds admin away gateway. ( #32425 )
...
* Adds admin gateway away
* I choose third option.
2017-11-05 17:35:20 -06:00
f8bd9ecf9c
Fixes old simple animal humanoid issues ( #32214 )
...
* fixes issue
* ignore that
* Spacebattle doesn't even open in DM
* Conflicts fixed for real
* Fixes pathing weirdness
* wonderful
2017-10-30 06:50:04 -05:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
cd562a3c87
Update centcomAway.dm
2017-10-13 07:30:23 -05:00
74c9b75ba1
Refactors away mission & space ruin area code.
2017-10-12 12:46:52 -05:00
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
493352f680
Update stationCollision.dm
2017-10-06 22:23:31 -05:00
848968834a
Fixes outdated away code.
2017-10-06 07:10:36 -05:00
cedb56af1b
Merge pull request #31302 from ninjanomnom/shuttle-rotation
...
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
3aafe338af
[MIRROR] Fixes adjust config ( #2723 )
...
* Fixes adjust config
* Update configuration.dm
* Update game_options.txt
* fixes persistance
2017-09-22 23:02:09 -05:00
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
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
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
849deb5e4e
Cleans up more paper fluff varedits. ( #30418 )
2017-09-06 18:42:43 -05:00
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
f33f543d8a
Merge branch 'master' into upstream-merge-30254
2017-08-29 22:12:34 -07:00
3e1031d6b9
Adds a ghost verb to see all available ghost spawners
2017-08-29 17:45:50 -05:00
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
LetterJay