a5ef41c0fc
adjust numbers, fix shuttle dropoffs
2020-03-07 20:31:49 +01:00
4ac2848282
fixes contract target blacklisting
2020-03-04 12:35:36 +01:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
2dd5a0cfb8
Merge branch 'master' into hijack
2020-02-19 22:25:31 -07:00
a9edff6e56
Supermatter sabotage no longer shows up with no supermatter
2020-02-18 11:51:03 -08:00
88ce25a09b
hopefully fixing the once-assassin
2020-02-03 08:10:45 -08:00
53cad493a7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
2020-02-03 03:17:23 -08:00
e812844c70
Revert "</span>"
...
This reverts commit d6d01d848c
2020-02-01 21:05:27 -08:00
d6d01d848c
</span>
2020-02-01 06:01:54 -08:00
50a53c6558
aaand a formatting oddity
2020-02-01 00:47:44 -08:00
425f532f76
WHOOPS
2020-01-31 13:12:50 -08:00
809f57a15d
also added kill-once objectives
2020-01-31 12:25:19 -08:00
d358913bde
linter is right, whoops
2020-01-28 17:26:32 -08:00
8df9a051ec
it compiles now, ready for testmerge probs
2020-01-27 19:09:04 -08:00
233aeaa456
removed some suggested bad possible contraband
2020-01-26 19:03:09 -08:00
37777c4cc7
Removed the wirecutting one
2020-01-25 13:37:40 -08:00
856ef236f3
Further runtime fixes by AnturK.
2020-01-24 23:01:30 +01:00
c58b4daa35
collectors too
...
this doesn't compile but like. it's a draft
2020-01-24 11:58:58 -08:00
847b3c0a09
Fixed flavor objectives and added more.
2020-01-24 10:46:07 -08:00
a8628cee33
udpates
2020-01-22 05:32:57 -07:00
5b6f95cb1e
shuttle hijack
2020-01-22 05:16:33 -07:00
815b4f033d
made flavor things a game option + more hoard
2020-01-20 04:13:54 -08:00
dfaa3bf15c
Added another flavor obj, "horde" to "hoard"
2020-01-20 03:46:44 -08:00
67c2fdca52
more flavor objectives
2020-01-20 01:20:42 -08:00
8e674817a9
errors
2020-01-20 00:30:18 -08:00
06c66617e6
m o r e traitor objectives
2020-01-19 18:58:10 -08:00
5eba760aa8
Reworked survivalist
2020-01-18 22:07:54 -08:00
e1cf63e0ac
Greentext tweaked
2020-01-18 21:32:42 -08:00
8c31c1036d
Porting objective code refactor
2019-11-04 22:05:04 +01:00
04a1c7ada4
Energy net and capture objective tweak.
2019-06-13 15:27:54 +02:00
91620218e4
some cherrypicked TG fixes and tweaks
2018-10-12 05:37:36 -05:00
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
aa7a27420c
Merge pull request #37863 from AnturK/rr4
...
Fixes changeling team objectives (a bit)
2018-05-16 14:35:49 -05:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
9520546277
Merge pull request #36772 from vuonojenmustaturska/dertpartment
...
Removes derpartment
2018-03-29 08:34:02 -05:00
cbb11e81e6
Merge pull request #35717 from AnturK/robolove
...
Fixes AI dating
2018-02-17 00:48:26 -06:00
01bc7310b6
Cryopods from Oracle Station
...
It's really nice to have a tg based station that's porting good shit.
2018-02-14 14:06:33 -06:00
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -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
Kraseo