Commit Graph

1946 Commits

Author SHA1 Message Date
LetterJay
87e8c66d5f Merge pull request #3378 from Citadel-Station-13/upstream-merge-31649
[MIRROR] Fixes invisible wirecutters and made screwdrivers easier to see in DM
2017-10-14 10:21:27 -04:00
LetterJay
0397bd57c1 Merge pull request #3377 from Citadel-Station-13/upstream-merge-31604
[MIRROR] Adds Toggle Underline button to PDA menu
2017-10-14 10:21:19 -04:00
LetterJay
c442f49cde Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645
[MIRROR] Cleans up explosives at syndie base
2017-10-14 10:20:27 -04:00
LetterJay
4b48651380 Merge pull request #3372 from Citadel-Station-13/upstream-merge-31646
[MIRROR] You can now drag-drop people into open DNA scanners
2017-10-14 10:20:11 -04:00
LetterJay
5bbf3b9735 Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620
[MIRROR] Fixes various Nanotrasen capitalizations
2017-10-14 10:19:15 -04:00
LetterJay
2e61af534e Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420
[MIRROR] Bullet decals tweak
2017-10-14 10:17:18 -04:00
LetterJay
8aebc3b15a Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909
[MIRROR] Radiation rework and subsystem
2017-10-13 23:58:04 -04:00
LetterJay
243e9d7acb Merge pull request #3362 from Citadel-Station-13/upstream-merge-31608
[MIRROR] Fixes explosion particles causing a massive amount of runtimes
2017-10-13 23:37:55 -04:00
LetterJay
e18e99f56f Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614
[MIRROR] Fixes electrocution animation
2017-10-13 23:37:46 -04:00
LetterJay
64b04b2c2f Merge pull request #3352 from Citadel-Station-13/upstream-merge-31631
[MIRROR] Use legacy topic keywords lookup method
2017-10-13 23:36:19 -04:00
LetterJay
66585f242c Merge pull request #3345 from Citadel-Station-13/upstream-merge-31512
[MIRROR] Refactors away mission & space ruin area code.
2017-10-13 23:36:01 -04:00
ShizCalev
ac660b6e3e Invisible wirecutters and made screwdrivers hivis (#31649) 2017-10-13 18:35:58 -05:00
AlecW
482e61a57e Adds Toggle Underline button to PDA menu (#31604)
* Add Toggle Underline button to PDA.dm

-Adds Toggle Underline button to PDA menu that, when pressed, applies underline styling to all <a> elements.

* Changed 1/0 to bools

Now using TRUE and FALSE, also cleaned some HTML I missed the first time
2017-10-13 16:51:44 -05:00
ShizCalev
c7afe4f70e Cleans up explosives at syndie base ruin (#31645) 2017-10-13 16:29:36 -05:00
MoreRobustThanYou
fdffebb3b8 You can now drag-drop people into open DNA scanners (#31646) 2017-10-13 16:28:24 -05:00
francinum
f63adc1931 Fixes various Nanotrasen capitalizations (#31620)
* Fixes capitalization of Nanotrasen for secsuits

gimme the GBP

* Fixes this one too
2017-10-13 12:13:26 -05:00
LetterJay
ce743f7d42 Update world.dm 2017-10-13 10:30:18 -05:00
LetterJay
6e10c020ec Update syndieminibomb.dm 2017-10-13 10:26:07 -05:00
nicbn
921b65ced0 Bullet decals tweak (#31420)
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
2017-10-13 09:47:10 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
kevinz000
40a1ceed26 Fixes explosion particles causing a massive amount of runtimes (#31608) 2017-10-13 09:15:53 -05:00
Jordan Brown
1941a8fcfa Merge pull request #31614 from AnturK/zap
Fixes electrocution animation
2017-10-13 09:14:45 -05:00
Jordan Brown
9d448fda76 Merge pull request #31602 from AnturK/tunnels
Fixes diagonal tunnels
2017-10-13 09:14:34 -05:00
LetterJay
da1eb3cd52 Merge branch 'master' into upstream-merge-31631 2017-10-13 08:31:13 -04:00
LetterJay
f488fa3ac3 Merge pull request #3356 from Citadel-Station-13/upstream-merge-31565
[MIRROR] Stargazers are now station-restricted, and cogged APCs are now quiet
2017-10-13 00:20:54 -04:00
LetterJay
116f06f428 Merge pull request #3348 from Citadel-Station-13/upstream-merge-31579
[MIRROR] Fixes foam darts on cardboard cutouts and shooting range targets
2017-10-13 00:07:14 -04:00
LetterJay
31914b7723 Merge pull request #3341 from Citadel-Station-13/upstream-merge-31549
[MIRROR] Fixes plastic explosive issues
2017-10-13 00:04:47 -04:00
LetterJay
aaa76a47f5 Merge pull request #3333 from Citadel-Station-13/upstream-merge-31617
[MIRROR] Fixes topic handlers
2017-10-12 23:49:26 -04:00
Ashe Higgs
f9436e53c4 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565)
* Clockwork power generator tweaks

* Includes a blob_allowed check
2017-10-12 18:32:37 -05:00
oranges
9663adaa3f Use legacy topic keywords lookup method 2017-10-12 16:06:02 -05:00
vuonojenmustaturska
12ef284e68 Fixes foam darts on cardboard cutouts and shooting range targets (#31579) 2017-10-12 15:46:05 -05:00
ShizCalev
74c9b75ba1 Refactors away mission & space ruin area code. 2017-10-12 12:46:52 -05:00
ShizCalev
4fe003af83 Fixes plastic explosive issues (#31549) 2017-10-12 12:38:08 -05:00
Jordan Brown
8ff51df06f Fixes topic handlers 2017-10-12 12:21:41 -05:00
Jordan Brown
c4653e6f5e Fix world/Topic calling the wrong handler proc (#31610) 2017-10-12 10:37:38 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
LetterJay
ec07e7b06f Merge pull request #3321 from Citadel-Station-13/upstream-merge-31541
[MIRROR] Allows sillicons to use vending machines.
2017-10-12 07:19:03 -04:00
LetterJay
9af6ffa946 Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543
[MIRROR] Datumizes world/Topic
2017-10-12 07:16:44 -04:00
LetterJay
05100a0c6a Merge pull request #3310 from Citadel-Station-13/upstream-merge-31282
[MIRROR] Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds
2017-10-12 07:16:35 -04:00
LetterJay
e15c337851 Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449
[MIRROR] Datum antag wizard.
2017-10-12 07:15:53 -04:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Dax Dupont
856b6ba853 Allows sillicons to use vending machines. (#31541)
* Allows borgs to use vending machines.

* Allows AI to use vending machines.
2017-10-12 00:29:43 -05:00
Jordan Brown
1604f8b1d3 Datumizes world/Topic (#31543)
* Datumizes world/Topic

* active_players requires comms_key
2017-10-12 00:28:27 -05:00
Ashe Higgs
fa0aaa9870 Reebe cogscarabs have infinite power and can recite scripture during non-clockcult rounds (#31282)
* During non-clock rounds, scarabs get more stuff

* Actually, admins might want to make scarabs...

* That's a thing
2017-10-12 00:28:20 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
MoreRobustThanYou
0b86f2befe Jungle Fever carriers now hear the proper antag sound (#31517)
* Jungle Fever carriers now here the proper antag sound

* less whitespace
2017-10-10 22:18:05 -05:00
LetterJay
3f6596dc17 Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406
[MIRROR] Adds Slappers
2017-10-10 22:34:28 -04:00
LetterJay
1330fdcdd7 Merge pull request #3299 from Citadel-Station-13/upstream-merge-31513
[MIRROR] Cleans up empty file
2017-10-10 22:34:20 -04:00
LetterJay
6e155be9fe Merge pull request #3298 from Citadel-Station-13/upstream-merge-31474
[MIRROR] Removes some spawns from explosion effects
2017-10-10 22:34:12 -04:00
LetterJay
be2d504b2b Merge pull request #3297 from Citadel-Station-13/upstream-merge-31327
[MIRROR] The shuttle can no longer leave during clockcult rounds
2017-10-10 22:33:52 -04:00