Commit Graph

924 Commits

Author SHA1 Message Date
Cyberboss 22fe5b12f1 Merge upstream 2017-04-02 22:27:22 -04:00
Cyberboss 3264fdd1d0 Port gibspawners to Initialize (#25794) 2017-04-02 23:01:42 -03:00
Cyberboss 78ee754da3 Merge upstream 2017-04-01 23:38:37 -04:00
Joan Lung da2c9f86e2 Merge pull request #25673 from Cyberboss/DecalsInit
Ports all decals to Initialize
2017-04-01 23:12:48 -04:00
Joan Lung 67fd0a9067 Merge pull request #25665 from Cyberboss/Botherance
Decals will no longer exist in walls, lava, or space
2017-04-01 23:11:25 -04:00
Cyberboss 0a34ef49ba Merge branch 'master' into DecalsInit 2017-04-01 22:41:18 -04:00
Cheridan 87c6cdefd3 Merge pull request #25733 from coiax/whoops-gibs-oil
Fixes runtimes with gibs and oil
2017-04-01 21:24:39 -05:00
Cyberboss e780145d66 Update misc.dm 2017-04-01 17:56:39 -04:00
AnturK e6803e64a2 Merge pull request #25580 from coiax/landmarks-refactor
Landmarks refactor, part 1
2017-04-01 13:26:03 +02:00
Cyberboss e3c31d2fa7 Roundstart Events. Fixes xeno egg announcement timer (#25659)
* Add support for roundstart events

* Fixes #25649
2017-03-31 20:20:40 +02:00
Jack Edge 443435bfe9 Fixes runtimes with gibs and oil 2017-03-31 19:12:05 +01:00
Cyberboss 5646c736c8 Merge upstream 2017-03-30 19:18:59 -04:00
Cyberboss 82b1b28d6b Ports all decals to Initialize 2017-03-30 16:18:35 -04:00
Cyberboss d0a517412e Decals can no longer exist on inappropriate turfs 2017-03-30 15:08:02 -04:00
AnturK 1b138562b4 Minor runtimes fixes. (#25566)
* Fixes power monitor runtime

* Fixes reagent data runtime

* Nullspace is no smoking zone
2017-03-29 19:21:51 -03:00
coiax d0c7e125f1 Fixes supermatter generated anomalies living too long (#25563)
- Changed from magic numbers to defines.
- Minor cleanup, use of QDEL_NULL and trimming some returns on
supermatter.dm
2017-03-29 19:19:54 -03:00
coiax b7a00f4025 Cleanables use Initialize() (#25576) 2017-03-29 19:15:31 -03:00
coiax afd9b4a88d Maintenance loot cleanup (#25448)
🆑 coiax
fix: All tophats, rather than just the ones in maintenance, hurt a tiny
bit if you throw them at people.
/🆑

- All tophats have throwforce 1
- Cable coils are now random colours
- Cable coils now actually come in stacks of 5 in maint
2017-03-30 09:03:15 +13:00
Jack Edge f55f037e53 Turns out that the chef job is actually called Cook 2017-03-29 18:51:24 +01:00
MMMiracles 48da27feb8 CereStation (#24665)
* cerestation test build or something i dunno

* map edits

* added exosuit/cyborg consoles to bridge, added experimentor to science test chamber. added directional signs to bridges for basic department directions.

* airless turfs HO

* TUUUUBES

* additional map edits

* SM engine, partial Engineering rework

* press x to .json

* CIRCUITS

* boss of this gym

* map changes galore

* atmos checkpoints + signs

* Add cerestation.dm

* quick fixes

* map edits again

* auth keypads + minimap

* suit change, button fixes

* maintenance + map + other stuff

* map fixes out the wazoo

* honk

* wowzer

* beware of basket-stealing bears, purges harmful heretic tags (for the most part)

* removes the bone-zone
2017-03-29 13:38:35 -04:00
Jack Edge 2947b6679d Converts Centcom 2017-03-29 18:08:30 +01:00
Jack Edge 2d78e0f582 Pubbystation landmark types 2017-03-29 17:04:53 +01:00
Jack Edge b6750ad83c Properly type all of Metastation's landmarks 2017-03-29 00:11:15 +01:00
Jack Edge 24bf8b2ae1 Changes hand named landmarks on Deltastation 2017-03-28 21:00:03 +01:00
Jack Edge fc89cc9c33 Removes unused monkeystart landmark type 2017-03-28 19:20:47 +01:00
Cyberboss cd050a38f0 Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency 2017-03-24 16:34:20 -04:00
Fox McCloud 7db6a982d7 Modular Receiver in Autolathe (#25401)
* Modular Receiver in Autolathe

* forgot this
2017-03-25 09:21:50 +13:00
coiax 2f1f827d93 Removes costume landmarks, replaces with spawners (#25400) 2017-03-24 08:53:02 -03:00
Cyberboss db99403313 Merge branch 'master' into TiredOfTheInconsistency 2017-03-23 09:21:20 -04:00
Cyberboss 0f71ac6190 Fixes window spawners qdeling in New() (#25357) 2017-03-22 16:11:40 -03:00
Cyberboss d0bfbc3e13 Rename ticker to SSticker 2017-03-22 10:48:25 -04:00
XDTM 7dfe07c027 Cloth Golems (#25249)
* Adds cloth golems
2017-03-20 17:02:18 -03:00
Cheridan a97355fda9 Some Anomaly Changes (#25228)
Pyroclastic anomalies make player-controlled adult slimes.
Tweaks announcement/spawn of anomalies some. Flux anomalies are super dangerous and are now announced ahead of time, and pyroclastic anomalies are somewhat less devastating so they're given some time before announcing, like gravitational ones.
2017-03-19 10:40:19 -03:00
MrPerson db34a1f2be Merge branch 'master' of https://github.com/tgstation/-tg-station into revert_revert_revert_come_on_revert_please_rever_please_shit_REVERT_JESUS_TAPDANCING_CHRIST_REVERT_YOU_FUCKING_PIECE_OF_GODDAMN_PISS
Conflicts:
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_object.dm
2017-03-15 18:53:09 -07:00
Tokiko1 bf85ff2327 Adds new gas interactions to supermatter, new minor and major failures and rebalances (#24785)
* Adds new gas interactions to supermatter.
Adds new minor and major failures to supermatter.
Adds highpressure windows to box.

* Shard now announces critical power and critical mass.

* Balance adjustments, some test stuff.

* Higher mole hot setups now scale in damage because they are harder to heat. Low mole setups, like the roundstart shard now cause less damage because they heat up smaller amounts of gas faster.

Actually made windows heat resistant now.

The supermatter crystal now takes damage from heat much earlier.

* Testing and tweaking more stuff.
Added tesla_zap proc.
Added anomaly generation.
Added occasional gravity pull in.

* Fixes anomaly spawner, hopefully fixes lightning bolts.

* Fixes supermatter lightning. Tweaks and balances some more values.

* Resolves conflicts for real now.

* Adds high pressure windows to the supermatter in box, meta and delta.
Fixed supermatter shutter button requiring atmos id on box and meta.
Readded the missing electrical supplies and welding locker to engineering of metastation.
Fixed stuff for travis.

* More balancing and behaviour changes.

* Adds heat_resistance to windows so windows can now survive more than TOC+1600 K if desired.
Also makes high pressure windows able to withstand 50000° K.

* More overcharge tweaks.

* Makes stuff compile and removes extra whitespaces.

* Even more tweaks.

* Rebalances power increase from matter, removes mass paper radiation exploits. Nerfs plasma. Removes mapchanges for the time being.

* Adds high pressure windows to the supermatter engine in box, meta and delta.

* Merge conflicts.

* Requested changes.

* Fixes supermatter zap overriding src.

* Fixes message timing.
2017-03-15 16:23:56 -04:00
Cyberboss a2ddba07d9 Kills a spawn (#25109) 2017-03-14 20:43:55 -04:00
Cheridan 742fcf0ffe Merge pull request #25044 from ChangelingRain/unbuff
Removes a ridiculous accidental buff to glowshroom spreading
2017-03-13 19:10:40 -05:00
coiax f096307c20 Generates messages when xeno eggs are delivered (#24852)
* Generates messages when xeno eggs are delivered

🆑 coiax
add: The egg spawner on Metastation will generate a station message and
inform the admins if an egg is spawned. (It's only a two percent chance,
but live in hope.)
/🆑

Metastation has a 2% egg spawner. If it picks the xeno egg, it does so
silently, telling no one. Now it informs the station and also admins and
the game log.

To reiterate, this behaviour is already in the map, I'm just generating
logging and messages. If admins want to simulate this, they can spawn a
`/obj/effect/spawner/xeno_egg_delivery` in any location they like.

* Xeno delivery makes a command report instead

I also refactored command report to avoid the duplication of the SECRET
COMMAND REPORT announcement.
2017-03-13 21:58:20 +13:00
Joan Lung 25ad77898c that didn't do anything 2017-03-12 23:37:20 -04:00
Joan Lung 360fc27428 this too 2017-03-12 23:33:54 -04:00
Joan Lung 18c2b0e2e0 Removes a ridiculous accidental buff to glowshroom spreading 2017-03-12 23:32:48 -04:00
MrPerson 589b4ce8ae Revert "Revert "Human nightvision""
This reverts commit c0ef5e59f7.

Conflicts:
	code/_onclick/hud/ghost.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_system.dm
	config/config.txt
2017-03-12 19:04:20 -07:00
coiax 196406210c Glowing goo glows green (#24981) 2017-03-12 09:16:40 -04:00
Joan Lung 7fa907ed81 Adds Shadowshrooms as a glowshroom mutation (#24898)
* Adds Shadowshrooms as a glowshroom mutation

* why the fuck would I do that
2017-03-11 05:18:43 +03:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Mike Long e9fe283494 Adds glitter bombs (#24700)
* Adds glitter bombs

* Fixes blue glitter description
2017-03-10 11:44:59 +13:00
oranges 935a3ff1b7 Merge pull request #24817 from Cyberboss/patch-20
Fixes start landmarks failing to GC
2017-03-10 09:23:02 +13:00
Joan Lung ea99851a07 Clockcult stuff has colored lighting (#24678)
* Clockcult stuff has colored lighting

* fixsigils
2017-03-08 12:03:12 -06:00
coiax f88184937a Glowsticks (#24761)
* Ports glowsticks from Bay

* Adds glowstick sprites

* Glowsticks in party crates, maint and emergency toolboxes
2017-03-08 02:38:15 -06:00
Cheridan deb4c2cde3 Merge pull request #24743 from ChangelingRain/glowshrooms
Glowshrooms now have colored light, tweaks glowshroom/glowberry lighting range
2017-03-08 02:30:46 -06:00