Commit Graph
8417 Commits
Author SHA1 Message Date
atermonera 0fbbf49840 Revert ":sadcatthumbsup:"
This reverts commit 2278a41211.
2022-04-02 14:54:08 -08:00
SpookertonandGitHub 201c3cb220 Merge pull request #8441 from Cerebulon/hairnets
Adds Hairnets
2022-04-01 18:32:33 +01:00
SpookertonandGitHub 339b42a690 Merge pull request #8484 from Rykka-Stormheart/shep-dev-defib-pain
Adds pain upon being revived with a defib
2022-04-01 18:28:37 +01:00
SpookertonandGitHub f06dcc071e Merge pull request #8470 from Verkister/patch-89
Some admin log "usr" fixes
2022-04-01 18:25:29 +01:00
SpookertonandGitHub 24ec2b2c66 Merge pull request #8468 from Verkister/patch-88
Fixes catwalks making footsteps on everything
2022-04-01 18:25:02 +01:00
spookerton 602cc67d2b removed CLAMP define 2022-03-31 19:21:58 +01:00
spookerton 5e7a007e47 clean up emag resolve_attackby, .orig files 2022-03-30 15:43:28 +01:00
spookerton 5212706f3d cleans up atom/movable/Destroy + adds walk(src, 0) 2022-03-30 15:04:11 +01:00
spookerton 209caf444c adds material armor crafting recipes 2022-03-30 15:03:27 +01:00
atermonera 861154df4d Revert "Fixes assorted mining toolspeed uses"
This reverts commit bd236dbdcf.
2022-03-29 16:19:36 -08:00
atermonera c7f1880394 Revert "What was supposed to be another straightforward major system overhaul that once again spiraled out of control (#8220)"
This reverts commit 4d8c43f106.
2022-03-29 16:01:32 -08:00
atermonera 20b60157eb Revert "A KNIFE!"
This reverts commit 0dabd4a717.
2022-03-29 15:54:14 -08:00
17e38ea58c Update code/game/objects/items/devices/defib.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-03-28 02:03:55 -06:00
Rykka 9bd77e462e Adds pain upon being revived with a defib
As stated.
When brought back to life, you're given a moderate amount of pain to simulate the defib pain.
2022-03-27 19:31:05 -06:00
AtermoneraandGitHub 614dbac882 Merge pull request #8479 from Mechoid/FixPuddleDefcon
Fix a Defcon grade runtime with puddle creation and deletion
2022-03-26 21:54:32 -08:00
Mechoid 2278a41211 :sadcatthumbsup: 2022-03-26 19:03:07 -07:00
VerkisterandGitHub d0f2724559 Update human.dm 2022-03-25 18:48:10 +02:00
VerkisterandGitHub 44166771c9 Update cards.dm 2022-03-25 18:46:19 +02:00
VerkisterandGitHub 871391f6f6 Update AI_modules.dm 2022-03-25 18:45:18 +02:00
VerkisterandGitHub f07059358a Update defib.dm 2022-03-25 18:44:18 +02:00
efa92bc700 Update code/game/objects/structures/catwalk.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-03-25 17:47:01 +02:00
VerkisterandGitHub 5b1e592293 Fixes catwalks making footsteps on everything
Fixes catwalks making footstep sounds on literally anything that crosses them, including ghosts and projectiles and everything else that definitely shouldn't be making footsteps.
2022-03-24 21:10:14 +02:00
Cerebulon 1ff390003e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hairnets 2022-03-22 01:39:59 +00:00
AtermoneraandGitHub 4280270e70 Merge pull request #8448 from Cerebulon/mugging
Robs You In Public
2022-03-20 11:28:24 -08:00
CerebulonandGitHub cafac92ada Map Tweaks March 2022 + Locker Equipment (#8439)
* Map and Locker Tweaks

* skybridge window tile switch

* additional changes
2022-03-20 11:16:17 -08:00
AtermoneraandGitHub 8f5bd6cc5a Merge pull request #8438 from Cerebulon/magmellitename
Changes Void Opals to Magmellite
2022-03-20 11:13:42 -08:00
Cerebulon e4d22f96cb Adds a bunch of mug variants 2022-03-18 18:05:24 +00:00
Cerebulon 75c7a03a7c Adds Hairnets 2022-03-17 18:48:43 +00:00
Cerebulon 3a5b038668 Changes Void Opals to Magmellite 2022-03-17 16:16:41 +00:00
listerla 899e769531 somethign -> something 2022-03-14 15:38:00 -04:00
Mechoid 222a68bcd7 Fix bugsons and an oversight. 2022-03-04 08:14:24 -08:00
AtermoneraandGitHub 8d6542547c Merge pull request #8407 from Mechoid/RealityPuddle
Fix the div 0 problem. God damnit.
2022-02-26 11:44:07 -08:00
AtermoneraandGitHub 1216f09f63 Merge pull request #8356 from Verkister/patch-82
Fixes non-growing spiderlings growing.
2022-02-26 11:07:45 -08:00
09c2272344 Update code/game/objects/effects/spiders.dm
Co-authored-by: Atermonera <atermonera@gmail.com>
2022-02-26 11:21:57 +02:00
Mechoid 527c7d1d11 Just fucking kill me 2022-02-22 00:22:39 -08:00
AtermoneraandGitHub 7428ac95c3 Fixes material bats not returning init hints (#8393)
* Fixes material bats not returning init hints

* Can the cans pass CI

* Brace for letting
2022-02-13 20:55:33 -08:00
MechoidandGitHub 6996e46ed4 Reagent Geysers, Pump Fixing, Puddles. (#8268)
* Reagent Geysers, Pump Fixing, Puddles.

* blah blah blah, CI fixes, linting, requested changes
2022-02-13 20:45:30 -08:00
CerebulonandGitHub 4fad562e9e Cybernetic Augments and Sick Tats (#8200)
* Cybernetic Augments and Sick Tats

* Cybernetic Augments and Sick Tats

* Fixed indentation

* Unused var

* Excludes metal bits from cloning/dna copies.

* Genetics as var

* Add a line.

* what if a list was a list
2022-02-12 23:51:04 -08:00
atermonera e6e434ad0b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cynosure_map 2022-02-12 15:14:31 -08:00
AtermoneraandGitHub 34b2b686f8 Merge pull request #8386 from Cerebulon/BuggyCode
Intentionally Introduces Massive Bugs
2022-02-07 18:00:25 -08:00
Cerebulon 539ac51ed8 PoIs + resin to magmellite 2022-02-07 09:42:37 +00:00
AtermoneraandGitHub 78810736a9 Merge pull request #8379 from Atermonera/fix_chembag_slowdown
"""Halves""" chem bag slowdown
2022-02-06 14:21:23 -08:00
Cerebulon 7dd4e0503c Intentionally Introduces Massive Bugs 2022-02-03 19:50:14 +00:00
AtermoneraandGitHub f603223d88 Adds antag subsystem to handle antag datum init (#8383)
* Adds antag subsystem to handle antag datum init. Moves antag datum defines to a module. Antagging new_players via traitor panel moves their created bodies to appropriate spawnpoints.

* Un-oopsies some unnecessary init order changes
2022-01-27 20:08:10 -08:00
atermonera 762fd8591a Merge branch 'master' into cynosure_map 2022-01-25 20:17:56 -08:00
atermonera 9122358136 """Halves""" chem bag slowdown 2022-01-22 16:35:42 -08:00
atermonera bd236dbdcf Fixes assorted mining toolspeed uses 2022-01-22 16:31:52 -08:00
AtermoneraandGitHub e9ddcc8bf5 Merge pull request #8372 from Atermonera/aknife
A KNIFE!
2022-01-22 15:39:49 -08:00
Atermonera 0dabd4a717 A KNIFE! 2022-01-18 17:29:50 -08:00
Cerebulon c2f4d10b8b Mech and Locker Sounds 2022-01-17 13:22:33 +00:00