Commit Graph

200 Commits

Author SHA1 Message Date
Jordan Brown
a9d452a24d Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
2018-04-30 12:51:40 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Jordan Brown
44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-18 11:34:06 -05:00
LetterJay
6b3a59b028 Merge pull request #6372 from Citadel-Station-13/upstream-merge-37117
[MIRROR] Removes some duplicated code
2018-04-14 07:45:15 -05:00
LetterJay
8e293a20aa Update asteroid.dm 2018-04-12 07:04:33 -05:00
ninjanomnom
5af97c3edc Removes some duplicated code 2018-04-11 15:01:10 -05:00
nicbn
f45a552c42 Code improvements on bullet damage decals (#36604)
Now fixing the dents is instant too

Maybe fixes #36601
2018-04-11 05:21:03 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
vuonojenmustaturska
d0075b37b3 Fixes a turf runtime (#37038) 2018-04-08 19:22:14 -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
Grandmother of 50
2d710e863f Archaeology... .... Code Cleanup (One day I promise!) (#36490)
* Improves Arch Code

* defines and stack_traces null values

* relocates 2 defines to "non-signal" section
2018-04-02 18:14:15 -05:00
fludd12
7826515aed Walls made entirely of wood! (#36524)
* Buffs Lifebringers (And kind of botany.)

* Retools staff to use earthsblood as fuel, can now remove rock walls

* No more blessings!

* Dismantle the means of production.
2018-04-01 12:24:33 -05:00
CitadelStationBot
c8c7e6575b [MIRROR] fixes "Xeno acid melts lava" (#6063)
* fixes "Xeno acid melts lava" (#36584)

* fix

* im dumb

* fixes "Xeno acid melts lava"
2018-03-22 06:08:51 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
2018-03-12 07:01:54 -05:00
CitadelStationBot
75b038511c [MIRROR] Alternative PR to brass apples: Adds bronze sheets (#5758)
* Alternative PR to brass apples: Adds bronze sheets (#35874)

* Adds bronze sheets

* nope!

* Alternative PR to brass apples: Adds bronze sheets
2018-03-02 20:07:39 -06:00
CitadelStationBot
d8faf15832 [MIRROR] Cleans up some spaces (#5593)
* Merge pull request #35811 from ShizCalev/spacing

Cleans up some spaces

* Cleans up some spaces
2018-02-19 10:27:17 -06:00
CitadelStationBot
1d028256d2 [MIRROR] Slippery Ice Fix (#5581)
* Slippery Ice Fix (#35770)

* Makes ice slippery again

* Update misc_plating.dm

* Slippery Ice Fix
2018-02-18 19:52:03 -06:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
vuonojenmustaturska
7214836012 Merge pull request #35734 from ShizCalev/path-cleanup
Cleans up unused /area paths
2018-02-17 09:39:20 -06:00
vuonojenmustaturska
5ea2e57419 Merge pull request #35629 from ShizCalev/floor-tool_acts
Converts floor tool interactions to tool_act, fixes flooring exploits
2018-02-16 06:07:19 -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
9b4770f855 [MIRROR] Mining tools now use tool system (#5462)
* Mining tools now use tool system

* Update hydroponics.dm
2018-02-14 05:36:15 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown
829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop
Makes templates able to use PlaceOnTop
2018-01-24 18:18:31 -06:00
KorPhaeron
3ef5dc14b5 Rebee atmos (#34723) 2018-01-21 21:07:28 -06:00
ShizCalev
f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-16 14:31:02 -06:00
BordListian
1a7341f2c4 Stray bullets and explosions don't blow up the entire syndi lava base anymore (#34401)
* - Changes explosions to save a reference to the epicenter atom
- Changes syndicate bomb cores to have themselves as the epicenter, removing a redundant get_turf call
- Changes explosive plastitanium walls to only be triggered by bomb core explosions. This is a tad cumbersome but there's only 12 of these walls in the game.

* - Removes debug code

* - Can't hurt
2018-01-16 08:36:27 -06:00
Emmett Gaines
a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
deathride58
62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310
[MIRROR] Removes some hrefs from logging
2018-01-12 17:48:13 +00:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Jordan Brown
057d05df91 Merge pull request #33484 from vuonojenmustaturska/eminencefix
Fixes glass shard/bananium floor behavior for cameras and ghosts
2017-12-13 09:14:16 -06:00
deathride58
216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00