Commit Graph
336 Commits
Author SHA1 Message Date
deathride58andkevinz000 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
kevinz000andGitHub 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 Brownandletterjay 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 Brownandletterjay a73bfd0913 Ports more things to Initialize (#38653) 2018-06-24 05:17:15 -05:00
Jordan Brownandletterjay 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
deathride58andGitHub 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 Brownandletterjay 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
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 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
vuonojenmustaturskaandletterjay 1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 07:38:01 -05:00
imsxzandletterjay 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
LetterJayandGitHub 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 Brownandletterjay 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
LetterJayandGitHub 39365437f5 Merge branch 'master' into upstream-merge-37293 2018-05-21 08:53:17 -05:00
LetterJayandGitHub 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 Brownandletterjay 3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
Jordan Brownandletterjay 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
2018-05-14 15:13:33 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 51b6ade3ef Update bombspawner.dm 2018-05-13 10:18:12 -05:00
LetterJayandGitHub ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742
[MIRROR] spellig fix
2018-05-13 03:28:39 -05:00
LetterJayandGitHub 80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
LetterJayandGitHub cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558
[MIRROR] Anomaly Armour Research
2018-05-12 21:36:51 -05:00
Armhulenandletterjay 56eab7e394 Fix spelling in mime forcefield description (#37742)
* SPELL IT RIGHT REEEEEEEEEEEEEEEEE

* Awhile
2018-05-11 17:30:58 -05:00
YPOQandletterjay f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
KorPhaeronandletterjay cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
deathride58andletterjay bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
Jordan BrownandCitadelStationBot deddd8debe Merge pull request #37622 from ShizCalev/cockarock
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -05:00
Jordan BrownandCitadelStationBot d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER
H.O.G.A.N. lawset
2018-05-01 15:40:09 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
pigeonsandCitadelStationBot 2b2ff05b73 Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again 2018-04-27 20:28:55 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
ShizCalevandCitadelStationBot 79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
vuonojenmustaturskaandCitadelStationBot bc68ed8536 Merge pull request #37125 from 81Denton/shuttle-window-name
Shuttle window spawner name fix
2018-04-12 06:37:25 -05:00
Poojawaanddeathride58 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
deathride58andGitHub 1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560
[MIRROR] [READY]AI latejoins
2018-04-08 02:25:10 +00:00
deathride58andGitHub 71344ce953 Merge pull request #6281 from Citadel-Station-13/upstream-merge-36975
[MIRROR] Removes a sound
2018-04-07 00:54:31 +00:00
kevinz000andCitadelStationBot 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturskaandCitadelStationBot aaf3bb66cf Merge pull request #36994 from 81Denton/window-spawner-names
Fixes window spawner names
2018-04-06 00:44:16 -05:00
Jordan BrownandCitadelStationBot 7cddf61b94 Merge pull request #36975 from KorPhaeron/sound2
Removes a sound
2018-04-06 00:43:56 -05:00
kevinz000andCitadelStationBot 4fb2e612df Fixes bloodbath effects not working on people in crit (#36598)
Also some minor improvements to performance by caching the nearby mobs list once
2018-04-03 22:01:59 -05:00
kevinz000 84ac06c986 Yeah no 2018-03-31 04:07:29 -07:00
CitadelStationBotandPoojawa dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)

cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
kevinz000andCitadelStationBot 2dcaf50d07 Fixes ghost portal teleportation (#36438)
* Forced teleportation by portals

* Update portals.dm
2018-03-17 08:22:46 -05:00
deathride58andGitHub a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58andGitHub aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070
[MIRROR] Beacons are no longer radios
2018-03-09 18:41:05 +00:00
QustinnusandCitadelStationBot 68757f1b44 Small moodie balance changes 2018-03-07 22:39:39 -06:00
ArmhulenandCitadelStationBot e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00