Commit Graph

354 Commits

Author SHA1 Message Date
Poojawa
73098574b7 what to do when footprints are being a bitch.
why, we get rid of them :honk:
2019-04-17 01:18:21 -05:00
Poojawa
f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Poojawa
f58cc09aed Some slight fixes 2019-04-16 08:53:19 -05:00
Poojawa
a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa
33c41e80c0 pretty sure I'm onto it 2019-04-13 04:33:40 -05:00
Poojawa
03a174d21f compile fixes except we're memes still
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
Poojawa
60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
deathride58
36119e007d Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 2019-03-15 16:49:10 -04:00
kevinz000
67d9dd4a82 Update effect_system.dm 2019-01-27 00:09:24 -08:00
kevinz000
2b2195baf5 Update glowshroom.dm 2019-01-02 07:24:37 -08:00
nik707
b76bb57609 Merge pull request #7734 from deathride58/fancylightingwave2
Fancy lighting wave 2 - nonbinary colored lighting now applies to gun/helmet flashlights, borgs, bots, welders, and more
2018-11-19 18:05:27 -06:00
deathride58
621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
kevinz000
14e654ac45 Update glowshroom.dm 2018-11-11 17:28:11 -08:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
kevinz000
5ccda57266 Update wormhole.dm 2018-07-24 01:06:37 -07:00
kevinz000
6e03770b93 Wormhole Update 2018-07-21 01:07:21 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
kevinz000
b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000
bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown
ac300966f5 Merge pull request #38702 from vuonojenmustaturska/cleanup
Remove unused and probably misbehaving admin human manifest spawner
2018-06-25 10:34:57 -05:00
Jordan Brown
a73bfd0913 Ports more things to Initialize (#38653) 2018-06-24 05:17:15 -05:00
Jordan Brown
9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders
Fix being able to pull mirage borders, others
2018-06-16 15:50:27 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
Jordan Brown
876e8ec713 Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors
Set cult floor effects to be on the floor plane
2018-06-01 09:50:58 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 07:38:01 -05:00
imsxz
5016ea6186 Add logging to mayhem bottle and blood frenzy (#37951)
* who the fuck didnt make this logged ages ago jesus fucking christ

* who fucking coded this garbage why isnt it a status effect

* Update mines.dm

* reeeeeeeee

* reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
2018-05-23 01:41:33 -05:00
LetterJay
01fc8cf128 Merge pull request #6555 from Citadel-Station-13/upstream-merge-37293
[MIRROR] Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
2018-05-22 07:17:41 -05:00
Jordan Brown
638c2eb81d Merge pull request #37974 from AutomaticFrenzy/patch/glowshroom-icon
Fix glowshrooms missing their icon in the editor
2018-05-21 16:44:52 -05:00
LetterJay
39365437f5 Merge branch 'master' into upstream-merge-37293 2018-05-21 08:53:17 -05:00
LetterJay
ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785
[MIRROR] Replaces loose tech storage boards with spawners
2018-05-15 06:53:25 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
2018-05-14 15:13:33 -05:00
LetterJay
ca86c93e70 Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406
[MIRROR] Adds (fake) ambient occlusion as a client preference
2018-05-13 11:52:23 -05:00
LetterJay
51b6ade3ef Update bombspawner.dm 2018-05-13 10:18:12 -05:00
LetterJay
ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742
[MIRROR] spellig fix
2018-05-13 03:28:39 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558
[MIRROR] Anomaly Armour Research
2018-05-12 21:36:51 -05:00
Armhulen
56eab7e394 Fix spelling in mime forcefield description (#37742)
* SPELL IT RIGHT REEEEEEEEEEEEEEEEE

* Awhile
2018-05-11 17:30:58 -05:00
YPOQ
f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
KorPhaeron
cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -05:00
Jordan Brown
d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER
H.O.G.A.N. lawset
2018-05-01 15:40:09 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
pigeons
2b2ff05b73 Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again 2018-04-27 20:28:55 -05:00