Commit Graph

296 Commits

Author SHA1 Message Date
vuonojenmustaturska
648040de9c Makes a couple of atmos procs a tiny bit faster, removes /datum/gas_mixture/thermal_energy() (#31321)
* Atmos stuff

* moved the define
2017-10-05 17:58:54 -05:00
LetterJay
ce933f19e0 Merge pull request #3142 from Citadel-Station-13/upstream-merge-31193
[MIRROR] Makes the pda font a prefernce
2017-10-05 08:38:19 -04:00
Supermichael777
63aa1c7153 Makes the pda font a prefernce 2017-10-04 19:28:57 -05:00
Leo
39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
2017-10-04 19:26:38 -05:00
oranges
c22f4a044d Merge pull request #31238 from AnturK/specialeyes
Space vision fix V2.0 - GAME_PLANE change
2017-10-04 15:14:07 -05:00
LetterJay
4959746caf Merge pull request #3113 from Citadel-Station-13/upstream-merge-31237
[MIRROR] Server tools API update to 3.1.0.1
2017-10-04 12:27:53 -04:00
oranges
2ec77d2d9b Merge pull request #31237 from Cyberboss/STAPIUpdate
Server tools API update to 3.1.0.1
2017-10-03 18:47:51 -05:00
oranges
baa53ba1d3 Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA
Makes mobs on fire light up
2017-10-03 18:14:10 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
LetterJay
b2a01d688d Merge pull request #3044 from Citadel-Station-13/upstream-merge-31136
[MIRROR] Adds a single comment to is_helpers.dm
2017-10-01 15:56:43 -04:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
ninjanomnom
009532b907 for completeness sake 2017-10-01 00:21:47 -05:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
LetterJay
11b558c367 Merge branch 'master' into upstream-merge-31093 2017-10-01 00:50:26 -04:00
Leo
fd7c9110ca Structure istype define 2017-09-30 21:31:57 -05:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
ShizCalev
f8f599b17b Stops putting RCD, bluespace bags, and staves into ORM 2017-09-29 19:33:37 -05:00
Jordan Brown
116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
Joan Lung
e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
KorPhaeron
bdae94f60c Shooting walls can create bullet holes/dents (#30714)
* Bullet holes in walls

* Code standards, new sprite
2017-09-28 21:48:27 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
LetterJay
18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
Jordan Brown
0a43bddaa1 Merge pull request #30863 from pubby/bluepipe
Bluespace pipes
2017-09-25 12:28:14 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
CitadelStationBot
d0274da310 [MIRROR] Click signals (#2903)
* Merge pull request #30924 from ninjanomnom/click-signals

Click signals

* Click signals
2017-09-22 18:59:17 -05:00
Poojawa
573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
LetterJay
54bd982d6b Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681
[MIRROR] Prevents the creation of Shadowzombiechangelings
2017-09-22 08:43:37 -04:00
Poojawa
aec48daa0a Ashdrake noms (#2868)
* Initial commit

* probably a better way to check this

* It compiled boys. Let's see if it works.

* IT WAS ALL NULLS, BOYS

* Hooray, it's not broken anymore boys!

* Well it works, but we need transfer IDs to work

locating them post-initialize would help, probably. Then assigning their
links soon after.

* Bellies linked, autotransfer, LoseTarget

* half-thought sanity check needs to go away

* A few last minute tweaks.
2017-09-21 06:29:08 -05:00
LetterJay
79d769532f Update DNA.dm 2017-09-19 11:18:22 -05:00
CitadelStationBot
ecce4cf138 [MIRROR] New DCS signals (#2741)
* New DCS signals

* Update atoms.dm

* actually ports comsigs
2017-09-19 07:00:08 -05:00
LetterJay
19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344
[MIRROR] Traitorbro gamemode
2017-09-18 08:35:00 -04:00
Poojawa
d5c012d431 Update role_preferences.dm 2017-09-17 22:38:03 -05:00
Poojawa
a4310ec6a6 Update atom_hud.dm 2017-09-17 22:37:44 -05:00
CitadelStationBot
d0c9f79a37 [MIRROR] Makes building with plasma glass a thing. (#2820)
* Makes building with plasma glass a thing. (#30800)

* Makes building with plasma glass a thing.

* Updated grille.dm

* Makes building with plasma glass a thing.
2017-09-17 22:22:50 -05:00
pubby
a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
CitadelStationBot
08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796)
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
2017-09-17 11:59:40 -05:00
KorPhaeron
d104c1d76c Prevents the creation of Shadowzombiechangelings 2017-09-15 03:08:07 -05:00
CitadelStationBot
82861d208b [MIRROR] Fixes lighting hard deleting (#2760)
* Fixes lighting hard deleting (#30684)

* Fixes lighting hard deleting
2017-09-14 06:44:17 -05:00
CitadelStationBot
9031a1b671 [MIRROR] Soft crit slowdown for all carbons (#2743)
* Soft crit slowdown for all carbons

* Update carbon_movement.dm

* Update carbon_movement.dm

* Update species.dm

* actually pay attention to spacings
2017-09-13 21:29:50 -05:00
LetterJay
1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -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