Commit Graph

1025 Commits

Author SHA1 Message Date
LetterJay
fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868)
* restricts traitor and ling jobs

* Update changeling.dm

* Update traitor.dm
2018-06-05 23:12:55 -07:00
KorPhaeron
4b38136d79 Only load Reebe during clock cult (#38156)
* Only load clock cult during clock cult

* Return FALSE
2018-06-03 09:02:55 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
ShizCalev
49bf67ed1d Updates BYOND links to use HTTPS (#37918)
* Updates BYOND links to use HTTPS

* revert

* if -> If
2018-05-20 15:31:28 -05:00
Nich
ed556b2c0e Removes the ability for RD's to steal hand teles (#37908) 2018-05-18 19:51:06 -05:00
vuonojenmustaturska
aa7a27420c Merge pull request #37863 from AnturK/rr4
Fixes changeling team objectives (a bit)
2018-05-16 14:35:49 -05:00
deathride58
50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
deathride58
c7ea689679 Update nuclear.dm 2018-05-02 10:33:50 -04:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
deathride58
862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276)
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
2018-04-27 07:40:45 -07:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
YPOQ
42372b8d04 Fixes eminences not being recognized as servants of ratvar (#37070)
* Fixes eminences not being recognized as servants of ratvar

* Readds istype check
2018-04-10 20:21:37 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
LetterJay
961c69a8e5 Merge pull request #6193 from Citadel-Station-13/upstream-merge-36800
[MIRROR] Adds check to keep observers from being recognized as servants of ratvar
2018-03-31 18:43:34 -05:00
AlexTheSysop42
360eb223b3 Adds check to keep observers from being recognized as servants of ratvar (#36800)
* Comments out code to try to fix a bug

* fixes servant ghosts being trapped on Reebe

* protip: next time don't commit to master

* ghosts no longer count as servants

* Undoes ghost check, moved to is_servant_of_ratvar

* change istype to isliving
2018-03-31 06:17:10 -05:00
Jordan Brown
9520546277 Merge pull request #36772 from vuonojenmustaturska/dertpartment
Removes derpartment
2018-03-29 08:34:02 -05:00
deathride58
15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective
Removes the old hypospray from CMO closet, updates tator objective
2018-03-27 17:41:44 +00:00
CitadelStationBot
4f254f181f [MIRROR] Sintouched antag datums (#6096)
* Sintouched antag datums (#36561)

* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs

* Sintouched antag datums
2018-03-26 04:19:49 -05:00
Poojawa
e52e52fa5d Removes the old hypospray from CMO closet, updates tator objective 2018-03-21 20:37:29 -05:00
CitadelStationBot
980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000)
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
2018-03-19 21:25:01 -05:00
Cruix
b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
CitadelStationBot
4439fa7e98 [MIRROR] why doesn't nukeops actually check required_enemies (#5908)
* why doesn't nukeops actually check required_enemies (#36056)

* which idiot added pre_setup()

* was I drunk

* Update nuclear.dm

* why doesn't nukeops actually check required_enemies
2018-03-12 07:04:04 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
2018-03-12 07:01:54 -05:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -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
0b07e1772a [MIRROR] Fix N^2 behavior in roundstart logout report (#5708)
* Fix N^2 behavior in roundstart logout report (#35862)

* Fix N^2 behavior in roundstart logout report

* Skip mobs which have never had a mind

* Fix N^2 behavior in roundstart logout report

* wew
2018-03-04 12:27:06 -06:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
deathride58
c7760707e6 Update game_mode.dm 2018-02-25 16:43:54 -05:00
Tad Hardesty
3790df44e5 Fix bogus var access 2018-02-25 15:24:46 -06:00
CitadelStationBot
2809f4e694 [MIRROR] Admin-only extended AND speedy versions of revs (#5661)
* Admin-only extended AND speedy versions of revs (#35873)

* extendedrevs

* honk

* add speedy revs, testing

* nit

* Admin-only extended AND speedy versions of revs
2018-02-22 23:40:19 -06:00
CitadelStationBot
350029e212 [MIRROR] Adds the missing wrapper to meteor report (#5587)
* Merge pull request #35798 from AnturK/meteorwrap

Adds the missing wrapper to meteor report

* Adds the missing wrapper to meteor report
2018-02-19 10:22:03 -06:00
deathride58
f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
2018-02-17 20:44:57 +00:00
Jordan Brown
cbb11e81e6 Merge pull request #35717 from AnturK/robolove
Fixes AI dating
2018-02-17 00:48:26 -06:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
Poojawa
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
CitadelStationBot
9b4770f855 [MIRROR] Mining tools now use tool system (#5462)
* Mining tools now use tool system

* Update hydroponics.dm
2018-02-14 05:36:15 -06:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot
60292af57f [MIRROR] Disentangles Command Reports from Metagame (#5294)
* Disentangles Command Reports from Metagame (#35192)

* False report fix

* Less Accurate Command Report

* Disentangles Command Reports from Metagame
2018-02-04 23:11:32 -06:00
Poojawa
aa04e62b29 cult lol xd 2018-01-31 08:07:22 -06:00