Commit Graph

65 Commits

Author SHA1 Message Date
Ghom
3ac61c0704 Porting tg painting code. (#12305)
* Porting tg painting code.

* yes.
2020-05-20 18:45:36 -07:00
Putnam
093d2fdeb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-lings-2 2020-04-10 20:12:35 -07:00
Putnam
f6e3a20f85 More tweaks 2020-04-10 20:12:15 -07:00
Putnam
d43e8052ad More threat swinging 2020-04-06 08:49:19 -07:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
Ghom
6159c197bb Update persistence.dm 2020-02-05 06:30:50 +01:00
Putnam
52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam
bc52b99758 ok putnam 2020-02-03 03:27:06 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
Putnam
8d5839c2d2 up to 100 it is then 2020-02-01 10:01:49 -08:00
Putnam
3dcce2b43a added some cleanup code 2020-02-01 09:10:02 -08:00
Putnam
463036a4f4 made panic bunker save in json 2020-02-01 08:44:05 -08:00
Putnam
21fc6d1d2b saving is back 2020-01-01 19:24:13 -08:00
Putnam
607109e0d2 also added individual ballot gathering 2020-01-01 12:29:13 -08:00
Putnam
bf752ab2e6 more extreme. 2020-01-01 00:30:34 -08:00
Putnam
6bbdd5d576 try recent round removal again 2020-01-01 00:26:55 -08:00
Putnam
f8557c8ae4 v o t e s a v i n g 2019-12-26 12:13:02 -08:00
Putnam
a471e26d9c WOW WHOOPS 2019-12-25 22:53:49 -08:00
Putnam
63112c2f49 while we're at it let's make it work for all of 'em 2019-12-25 18:30:25 -08:00
Putnam
5764ccef1b Allowed preventing dynamic storytellers if too common recently 2019-12-25 16:16:11 -08:00
Putnam
5cd9edb37f also make weight adjustment round-to-round work, probs 2019-12-24 22:05:04 -08:00
Putnam
0075037d0f Makes (most) dynamic rulesets lower weight if recently fired 2019-11-24 17:09:38 -08:00
Putnam
ab87fd32ed Adds extended voting to dynamic. 2019-11-20 02:23:53 -08:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Ghommie
50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
Poojawa
09512a6001 Controllers 2018-09-11 02:04:10 -05:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07: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
AnturK
68c6848a70 Fixes trophies. (#37266) 2018-04-17 05:25:41 -05:00
AnturK
15ac393773 Filters out duplicate trophies. 2018-04-15 12:42:41 -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
Dax Dupont
27ff0a4f28 Display cases can now have a list where to randomly spawn items from (#36058)
* Adds allowing display cases to pick from a random list

Keeps compatibility with older maps and moves trophy/plaque message to all display cases

* A bit more legible

* Refactors statues tool interaction code

* Don't override it already exists

* done
2018-03-09 02:17:36 -06:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:39:08 -06:00
CitadelStationBot
a5d1cae1ac [MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313)
* Fixes smugglers satchels being able to refresh items forever (#35270)

* Fixes smugglers satchels being able to refresh items forever
2018-02-05 00:48:12 -06:00
deathride58
1acdd3ce5c controllers sync 2018-01-03 23:23:11 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
oranges
48212ee000 Merge pull request #31082 from Incoming5643/Satchel_Fix
Repairs and Intensifies Secret Satchels
2017-10-01 15:02:23 -05:00
CitadelStationBot
3aafe338af [MIRROR] Fixes adjust config (#2723)
* Fixes adjust config

* Update configuration.dm

* Update game_options.txt

* fixes persistance
2017-09-22 23:02:09 -05:00
LetterJay
c7ae892e8d Update persistence.dm 2017-09-11 15:53:35 -05:00
LetterJay
e0e552829c Update persistence.dm 2017-09-11 15:47:18 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
Poojawa
ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654)
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
2017-09-08 06:58:08 -05:00
LetterJay
96c790a81f Unruntimes fdel on savefiles 2017-09-02 05:23:35 -05:00
CitadelStationBot
c2a792d577 Converts npc saves to jsons 2017-08-30 08:01:36 -05:00
kevinz000
93647d77ad [DNM] Fixes the codebase (#2556)
* fixes stuff

* goddamnit flags
2017-08-30 00:08:40 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00