Commit Graph

392 Commits

Author SHA1 Message Date
LetterJay
3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
LetterJay
07afeccfe9 Merge pull request #3885 from Citadel-Station-13/upstream-merge-32602
[MIRROR] Items no longer need to check for tools in attackby
2017-11-12 08:21:26 -06:00
LetterJay
9b406f88a7 Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400
[MIRROR] Assmos tweaks/minor additions.
2017-11-12 08:21:09 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Leo
73cb2ead88 Items no longer need to check for tools in attackby 2017-11-11 14:31:12 -06:00
as334
7f9800e8fa Assmos tweaks/minor additions. (#32400)
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.

* Review response.

* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:31:16 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
CitadelStationBot
cde4d39989 [MIRROR] isatom is now an alias for isloc (#3861)
* isatom is now an alias for isloc (#32514)

isloc() returns true on anything that can be a loc. Only atoms can be a loc. Its basically isatom, but with a odd ass name.

It, like other builtin byond is* procs, uses typeid to check, not istype, saving the standard mess of recursive type searching that istype uses, thus its faster.

* isatom is now an alias for isloc
2017-11-09 05:35:35 -08:00
LetterJay
ea44e4a1d9 Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489
[MIRROR] Global vest lists
2017-11-08 02:21:36 -06:00
LetterJay
448326cd60 Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466
[MIRROR] Fixes turf_decal layering
2017-11-08 02:21:13 -06:00
LetterJay
56415d62d3 Merge pull request #3847 from Citadel-Station-13/upstream-merge-32448
[MIRROR] (Hopefully!) Final clockwork marauder balancing pass
2017-11-08 01:44:51 -06:00
ShizCalev
5f5f313551 Global vest lists (#32489)
* Global vest lists

* revised coat

* Fixed duped proc
2017-11-07 23:57:57 -06:00
ShizCalev
88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
Ashe Higgs
577d1b7d20 Marauder balancing pass (#32448) 2017-11-07 09:57:26 -06:00
Leo
4bd172f7da Merge pull request #32465 from MoreRobustThanYou/patch-11
Removes some unused clockwork defines
2017-11-07 08:00:05 -06:00
LetterJay
9e28d79b8c Merge pull request #3775 from Citadel-Station-13/upstream-merge-32334
[MIRROR] Adds around 30 new ambience sounds, and changes ambience code a little bit
2017-11-07 03:49:46 -06:00
LetterJay
23d6ccb27a Update sound.dm 2017-11-04 22:44:01 -05:00
nicbn
46c62b6293 overhaul (#32316) 2017-11-03 23:40:27 -05:00
Qustinnus
d475149e8d Adds around 30 new ambience sounds, and changes ambience code a little bit 2017-11-03 15:53:09 -05:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
LetterJay
47cfffbb26 Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116
[MIRROR] Line by line profiling system
2017-10-29 15:48:47 -04:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
f900f2ea9a Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
LetterJay
1005211741 Merge pull request #3654 from Citadel-Station-13/upstream-merge-32130
[MIRROR] [s] Makes ImmediateInvokeAsync a world proc
2017-10-29 03:47:12 -04:00
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
LetterJay
3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
LetterJay
c64446962d Merge branch 'master' into upstream-merge-32096 2017-10-28 03:47:08 -04:00
LetterJay
a221d3505f Update DNA.dm 2017-10-28 02:19:08 -05:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
Jordan Brown
82c388b3e8 Makes thermite a component 2017-10-27 17:36:38 -05:00
oranges
f6a00d4a38 Merge pull request #32130 from Cyberboss/call_security
[s] Makes ImmediateInvokeAsync a world proc
2017-10-27 17:33:42 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051)
* more balance changes and fixes

* cleanup
2017-10-27 03:08:03 -05:00
LetterJay
af96c29a0c Merge pull request #3635 from ktccd/Undo_Borer_HUDS
Undoes Borer HUDs
2017-10-27 02:49:03 -04:00
LetterJay
141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
LetterJay
a7b464e47e Merge pull request #3620 from Citadel-Station-13/upstream-merge-32030
[MIRROR] Allows components to qdel from Initialize
2017-10-27 02:19:07 -04:00
LetterJay
49fa09d1bd Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944
[MIRROR] Atmos construction rework again
2017-10-27 02:00:11 -04:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
ktccd
ad911c2b1b Undoes Borer HUDs
Critical flaw in antag-HUD system prevented proper use, since automatic
reverting of original PR is no longer possible, (Probably due to another
antag-hud being added afterwards), this is a manual one.
2017-10-26 21:19:34 +02:00
KorPhaeron
9f7a7bcc22 Vampire species for halloween 2017-10-26 11:55:40 -05:00
Jordan Brown
50f942ef4e Allows components to qdel from Initialize 2017-10-26 00:01:52 -05:00
CitadelStationBot
7ad3afa3c0 [MIRROR] Footprints no longer contain stupid amounts of blood (#3602)
* Footprints no longer contain stupid amounts of blood (#32056)

* Footprints no longer contain stupid amounts of blood
2017-10-25 20:01:31 -05:00
ShizCalev
889d2ba74e Moves opened firedoors underneath opened airlocks 2017-10-24 00:05:43 -05:00
duncathan salt
ed12370a73 Atmos construction rework again 2017-10-23 16:29:53 -05:00
AnturK
0faee43f95 Cleans up datum traitor minimally. (#31978)
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
2017-10-22 17:44:55 -05:00
LetterJay
5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780
[MIRROR] Disentangles blob from blob mode/removes blob mode
2017-10-22 16:39:35 -04:00
Jordan Brown
ff1a3e9f0a Safeguards GetAllContents and makes it throw a warning 2017-10-21 18:56:14 -05:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00