LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -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
kevinz000
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
2342c8f2bc
Fixes scythes cutting kudzu ( #2185 )
2017-07-29 19:50:24 -07:00
ktccd
fd3ec99487
Xeno-pepe is now more rare ( #2106 )
...
Increased minimum player requirement for xenomorph event, as lowpop
xenos suck hardballs.
Also added minimum timer to the event, up from 20 to 40 min.
Weight kept the same, half default.
With this, xenomorphs should hopefully be more rare, although there's
STILL other sources to enable them those ones ALL require a human to be
dumb/malicious and release them.
2017-07-24 04:07:30 -07:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
kevinz000
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
CitadelStationBot
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
LetterJay
9d3c4d4702
Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215
...
[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
CitadelStationBot
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
CitadelStationBot
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -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
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBot
b47109a54c
ayys are more likely to visit the station ( #1368 )
2017-06-13 13:40:54 -07:00
LetterJay
c760c52817
upstream-merge-27951
2017-06-11 02:11:34 -05:00
CitadelStationBot
38a1e1d984
Removes a spawn
2017-06-08 09:46:57 -05:00
LetterJay
7a7f00bdd1
THE DEVIL
2017-06-05 04:35:22 -05:00
CitadelStationBot
e8663bee81
Refactors the latejoin list
2017-06-04 15:08:35 -05:00
CitadelStationBot
b85384c0ad
Fixes meteor and immoveable rods hitting Centcomm ( #1252 )
2017-06-02 21:36:45 -07:00
LetterJay
fbbceadc6e
Merge branch 'master' into AllMapChangesInOne
2017-05-30 23:08:32 -05:00
LetterJay
9b00499d24
It's been a long night
2017-05-30 22:41:22 -05:00
LetterJay
1763c4b65d
Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
...
[MIRROR] Area Refactor + Var-edit Cleanup
2017-05-30 20:49:42 -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
29c15fe9fd
Centcomm is on Z1
2017-05-27 20:57:26 -05:00
CitadelStationBot
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
CitadelStationBot
efa9de6da9
Area Refactor + Var-edit Cleanup
2017-05-22 22:08:35 -05:00
CitadelStationBot
7a66ea60fb
Space vines can no longer spread on transit turfs ( #1026 )
2017-05-18 13:18:48 -05:00
CitadelStationBot
c6a671a11b
[MIRROR] Devil refactor+small revamp ( #887 )
...
* Devil refactor+small revamp
* Delete mind.dm.rej
* clean up rej
* Delete admin_investigate.dm.rej
* Delete mapping.dm.rej
* compile fix
2017-05-18 09:06:01 -05:00
LetterJay
45c283a935
applies the previous fixes for cult on a closed PR
2017-05-16 22:59:41 -05:00
CitadelStationBot
e661d82030
Goats eat glowshrooms
2017-05-14 07:38:00 -05:00
LetterJay
6310292531
woo
2017-05-02 11:19:14 -05:00
LetterJay
991fb8335c
manual merge
2017-04-29 11:42:28 -05:00
CitadelStationBot
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
CitadelStationBot
4baa357739
Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-24 18:07:12 -05:00
CitadelStationBot
032baebb85
Adds badmin abuse limits to petsplosions ( #492 )
2017-04-20 22:01:48 -05:00
CitadelStationBot
7759e8fb08
>Can't stop fucking up spacevine PRs
2017-04-17 17:40:53 -05:00
CitadelStationBot
21827263f5
Fix spacevines again ( #428 )
2017-04-17 08:37:25 -04:00
CitadelStationBot
ba95892ddd
Fixes kudzu ( #422 )
2017-04-16 18:12:29 -04:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
Poojawa
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
