Armhulen
2f64e2099f
Rare Spider Variants! ( #30593 )
...
* vipers use venom, tarantulas are fat and slow.
* viper!
added!
* tarantula!
done!
* tarantulas are big guys
nobody pushin them round
* added maidwives, added spider channel
* me and cobby lose our minds over shitcode 2
electric boogaloo
* midwives have skins
shiny
* YES XHUIS GOT IT WORKING WHAT A GUY YEAAAAAAAAAAA
WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
* new nurse sprite is in!
yay
* cosby joke about all my shit corrupting idk
this is gonna be annoying to fix
* Revert "cosby joke about all my shit corrupting idk"
This reverts commit 680b4c310e0b882f7465129c093e7f69fdff15c6.
* starts to add spidervenom, finishing tomorrow
* fuck god dammit shit fuck
* WE ARE BACK IN BIZNIZ TY ORANGES
* whoops
* feed me semour feed me all night long
fixes the cyberboss stuff except that complicated one i'll do something else with it for now
* temporary fix maybe
* lets just have this for now and i'll fix this later
* all good
* fixes
* does what i should have done a long time ago
* SKINS SKINS SKINS PULLAPALOOZA
* i think this does it okay
* spiders miright
* merge conflict fix?
* MISTAKES WERE MADE
* spider commands are cool now
* he protec
but he also attac
* ty joan
* ty joan again
2017-09-23 16:18:43 -05:00
CitadelStationBot
170f5d7a5e
[MIRROR] Log file for PDA messages ( #2848 )
...
* log file for pda messaegs (#30827 )
* Log file for PDA messages
2017-09-19 06:34:53 -05:00
LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
LetterJay
be15a30098
Update mapping.dm
2017-09-13 03:56:06 -05:00
Kyle Spier-Swenson
3da71799ab
Garbage collection tweaks and refactors. ( #30118 )
...
* Garbage collection queuing rewriting
* Some Tweaks
* Fixes some queue tracking oddities
* More tweaks
* Remove the middle two queue steps. tis was a silly idea
* New logging.
We store logging datums for use in tracking the stats of shit qdeleted
Added logging for destroy time as well as hard delete time, per type. As well as a few others
* Fix compile for testing
* Does the cyberboss
* does the antur
2017-09-13 01:47:12 -05:00
LetterJay
496b5d17c2
Update mapping.dm
2017-09-11 15:52:58 -05:00
LetterJay
c6c34b07be
Update mapping.dm
2017-09-11 15:46:45 -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
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
3e1031d6b9
Adds a ghost verb to see all available ghost spawners
2017-08-29 17:45:50 -05:00
LetterJay
47aa97b847
Merge pull request #2523 from Citadel-Station-13/upstream-merge-30207
...
[MIRROR] Adds separate log for sql errors with no config check
2017-08-28 09:00:19 -05:00
CitadelStationBot
ed1a06a9ed
Adds separate log for sql errors with no config check
2017-08-28 02:20:16 -05:00
CitadelStationBot
d38580afcd
Holoparasite prompts now have a "Never For This Round" option
2017-08-26 11:07:20 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
ktccd
c52f7a0475
Delayed objective ( #2140 )
...
Delayed objective [Latejoiners can now be selected as traitor targets]
2017-07-27 05:27:58 -07:00
CitadelStationBot
64966027e7
fixes hub not working ree ( #2112 )
2017-07-24 04:05:44 -07:00
CitadelStationBot
665e1f2e8e
Unprotects the deadmin list ( #2059 )
2017-07-18 06:14:19 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
9874978c5c
Dreams while sleeping are now slightly longer on average and will contain more possibilities ( #1940 )
2017-07-07 23:48:49 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
LetterJay
a8b498a2a9
Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407
...
[MIRROR] [READY]Adds examine tooltips
2017-06-20 01:29:44 -05:00
LetterJay
a4c9dc43dd
Dufflebag => Dufflebag
2017-06-19 16:42:05 -05:00
CitadelStationBot
9863f88366
[READY]Adds examine tooltips
2017-06-18 21:58:37 -05:00
LetterJay
ff8b2acf9e
Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145
...
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
2017-06-14 08:58:35 -05:00
LetterJay
2ff24e70a5
Merge pull request #1218 from Citadel-Station-13/upstream-merge-27686
...
[MIRROR] No more erros
2017-06-14 08:16:02 -05:00
CitadelStationBot
97005222ff
Blood Cult Nerf: Restricted Nar-Sie summoning locations ( #1479 )
2017-06-13 13:48:49 -07:00
CitadelStationBot
1bdda132e7
Adds Medal Commendations!
2017-06-08 20:39:15 -05:00
CitadelStationBot
06187dd178
Syndicate Uplink - Typos & Grammar mk2
2017-06-07 14:56:22 -05:00
CitadelStationBot
e8663bee81
Refactors the latejoin list
2017-06-04 15:08:35 -05:00
CitadelStationBot
c1adecc0e2
Fix AI status displays to use a list instead of the world list ( #1391 )
2017-06-04 09:08:04 -07:00
CitadelStationBot
263b79b299
[MIRROR] Individual logs are no longer lost with mob changes ( #1249 )
...
* Individual logs are no longer lost with mob changes
* Delete mob_defines.dm.rej
2017-06-02 22:01:58 -07:00
CitadelStationBot
ab39ece501
No more erros
2017-05-26 23:53:24 -05:00
CitadelStationBot
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
LetterJay
cbae09b538
rej cleanup/commit
2017-05-22 16:59:39 -05:00
LetterJay
aad357bd74
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450
2017-05-22 16:56:18 -05:00
CitadelStationBot
26448d7016
Removes the mess added with recalling with a message
2017-05-21 07:57:17 -05:00
Poojawa
186ed2acbb
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
2017-05-21 00:44:08 -05:00
CitadelStationBot
88ede32216
[MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition ( #994 )
...
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition
* Rej cleanup
* update mob.dmi
* Update living_defense.dm
2017-05-20 23:00:02 -05:00
CitadelStationBot
94b7e560ab
World.dm Refactor
2017-05-18 16:37:46 -05:00
CitadelStationBot
a317d23a51
[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie ( #916 )
...
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie
* fixes .rej
2017-05-18 09:37:30 -05:00
CitadelStationBot
6617f68604
[MIRROR] Harvesters are more fun to play ( #894 )
...
* Harvesters are more fun to play
* resolve .rej
2017-05-18 07:12:29 -05:00
LetterJay
d40c2224c3
Merge pull request #624 from Citadel-Station-13/upstream-merge-26492
...
[MIRROR] Adds new debug verb for highlighting roundstart ATs
2017-05-18 05:51:54 -04:00
CitadelStationBot
626959d96e
[MIRROR] Fixes a bunch more cult bugs ( #853 )
...
* Fixes a bunch more cult bugs
* Resolves .rejs and icons
2017-05-18 03:21:07 -05:00
CitadelStationBot
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
d7c24de679
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26492
2017-05-17 09:58:53 -05:00
LetterJay
bdbedd33f4
Merge branch 'master' into upstream-merge-26776
2017-05-17 05:14:18 -04:00
LetterJay
45c283a935
applies the previous fixes for cult on a closed PR
2017-05-16 22:59:41 -05:00
LetterJay
4710beca0e
Merge pull request #807 from Citadel-Station-13/upstream-merge-26631
...
[MIRROR] 2017 Cult Overhaul P1: Cult Master and Datum Cult
2017-05-16 17:13:30 -04:00
