deathride58
936c6a33f2
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475
2018-03-09 14:18:47 -05:00
Robustin
e9d3af6e61
The ARM is now harder to obtain ( #36051 )
...
* Added ARM difficulty
* Working edition Pt1
* Actually working Pt2
* Appropriate null check?
* Update narsie.dm
2018-03-09 02:17:46 -06:00
Qustinnus
a96a28f3d6
[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-07 20:49:25 -06:00
Poojawa
86b11050b6
Citadel's folder's end ( #5828 )
...
* ERP, miscreants, clothing
* github pls
* guns, dogborg, areas, vendor
* finishes moving around the last of the stuffs
* cleaned up shit. italics on subtle messages
vore code to modular_citadel too
* updates codeowners and recompiles tgui
because it's a healthy thing to do
* reee, I had that spawner set byond
* cleans up a bad pipe
does the thing I've been meaning to do for a while now as well.
* bumps up xenobio console requirements
inb4 reee
* snowflake commenting
2018-03-06 17:40:48 -06:00
CitadelStationBot
a2e6253f00
[MIRROR] Disease antagonist ( #5815 )
...
* Disease antagonist
* Update mobs.dm
* can I go to sleep yet
2018-03-05 15:20:59 -06:00
CitadelStationBot
30a4705c01
[MIRROR] Clean up all sorts of crap, mostly defines ( #5788 )
...
* Clean up all sorts of crap, mostly defines
* fixes compile errors
2018-03-05 13:23:28 -06:00
LetterJay
863585f477
Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440
...
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 23:37:41 -06:00
CitadelStationBot
8543df055d
[MIRROR] Add parallax sprites from RIS ( #5749 )
...
* Add parallax sprites from RIS (#36049 )
* Add files via upload
* Update parallax.dm
* Add parallax sprites from RIS
2018-03-02 18:35:35 -06:00
Ashe Higgs
0a449af83e
Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 14:38:18 -06:00
CitadelStationBot
0ad6fe35e0
[MIRROR] [s] Fixes observers being able to create areas ( #5724 )
...
* [s] Fixes observers being able to create areas (#36006 )
* Fixes observers being able to create areas
* Exception for admin ghosts
* [s] Fixes observers being able to create areas
2018-02-27 05:04:00 -06:00
Ashe Higgs
a7d5e4cdcf
Refactors butchering to a component - item-based butchering effectiveness, speed, and chances ( #35744 )
...
* Butchering component
* auto-butchering based on toolspeed
* Gives drills their butchering back
* redoes toggles
2018-02-25 14:50:29 -06:00
deathride58
a3180b0173
Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431
...
[MIRROR] html_interface removal and crew monitoring console refactor.
2018-02-16 14:27:26 +00:00
AnturK
35b8e410be
html_interface removal and crew monitoring console refactor.
2018-02-15 14:31:27 -06:00
Jordan Brown
7b493c30d7
Merge pull request #35664 from AnturK/tooltipruntimes
...
Fixes some tooltip runtimes
2018-02-15 10:38:27 -06:00
ShizCalev
f4685cfe01
[s] Fixes altclick exploits
2018-02-11 05:08:00 -06:00
Slignerd
afcdb771b3
Squashes silicon HUDs together ( #35212 )
...
* Squashes silicon sensors together
* Fixes proc names
* Brings back individual sec/med huds for pai usage
* This fixes the pai
* Fixes toggle text
2018-02-07 02:32:14 -06:00
deathride58
09436512b4
Merge branch 'master' into TG-sync-testing
2018-02-03 01:52:44 +00:00
CitadelStationBot
f02529555c
[MIRROR] Fix roundend splash screens ( #5242 )
...
* Fix roundend splash screens
* Update screen_objects.dm
2018-02-02 01:22:56 -06:00
Poojawa
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
Poojawa
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
deathride58
625d46fa19
Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606
...
[MIRROR] Config dir again except this time it works
2018-01-21 22:41:13 +00:00
LetterJay
923b72e138
Update ghost.dm
2018-01-21 14:19:48 -06:00
Jordan Brown
8dead1da6a
Config dir again except this time it works
2018-01-21 12:32:29 -06:00
Jordan Brown
c36b095146
Fixes ghost show_hud runtime
2018-01-21 09:14:50 -06:00
deathride58
cf538efeb7
Update credits.dm
2018-01-19 08:47:27 -05:00
Leo
a0f815c5c4
Revert "Fix config_dir usage ( #34469 )"
2018-01-18 19:38:40 -06:00
ShizCalev
80095fea0a
Replaces cached get_area vars for names ( #34338 )
2018-01-13 20:56:11 -06:00
Tad Hardesty
06120d3174
Grammarize the internals screen object
2018-01-13 04:36:43 -06:00
deathride58
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
deathride58
bd160e46d9
Update adjacent.dm
2018-01-05 17:25:41 -05:00
Jordan Brown
5c64e25288
[512] Disallow cross-Z examination and manipulation
2018-01-05 09:25:54 -06:00
deathride58
af96f58ffd
syncs defines
2018-01-03 23:15:49 -05:00
LetterJay
c8f3fdfe38
Merge branch 'master' into upstream-merge-33663
2017-12-30 13:29:36 -06:00
LetterJay
6f8c2c1daf
Update item_attack.dm
2017-12-29 18:40:58 -06:00
LetterJay
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
XDTM
d8943d6a1e
[Ready]Adds the Pax reagent, small tweaks to pacifism
2017-12-29 02:37:58 -06:00
YPOQ
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
LetterJay
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
LetterJay
14472e5139
Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485
...
[MIRROR] code improvements from mso and co
2017-12-26 07:38:17 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
LetterJay
56ecc13289
Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
...
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
deathride58
b2187123fb
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
...
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
Armhulen
55ee64940f
code improvements from mso and co
2017-12-18 20:50:07 -06:00
LetterJay
d384941d5c
Update robot.dm
2017-12-17 15:56:44 -06:00
XDTM
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
