64930de41c
Makes all toy figurines tiny and refactors the code behind it ( #15368 )
...
* Makes toy figures tiny and refactors the code behind it
* Apply suggestions from code review
Co-authored-by: dearmochi <shenesis@gmail.com >
* atom_say and capitalize names
* Web edit baby
* Merge conflict fixes
* Init instead of New
* prize_ball instead of mechball
* prize_ball should not be a figure. Revert but keep the Init change
Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com >
Co-authored-by: dearmochi <shenesis@gmail.com >
2021-07-15 13:59:26 +01:00
035964ceb2
Merge remote-tracking branch 'ParadiseSS13/master' into toml-config
2021-07-13 14:25:12 +01:00
3e8482cebb
Makes machine frames show their circuit name ( #15025 )
...
* Circuit Names Refactor
* Some review stuff
* now with less runtimes
* Machine Boards and Computer Boards
* Only a little late
* YouTool fix
* Resupply crate too
* Supplycomp board
I'll do the other stuff tomorrow
* Computer Frame Refactor
Plus also removing the HONKputer to avoid a conflict.
* Don't need this diff anymore
2021-07-10 19:43:40 +01:00
59938c00e5
Merge branch 'master' into solgov_ERT
2021-07-10 15:43:33 +01:00
f83b8ae14e
Suggested stuff
2021-07-09 19:44:02 +02:00
9ddf4ceb97
Merge remote-tracking branch 'ParadiseSS13/master' into toml-config
2021-07-09 11:42:23 +01:00
908c4f0dd1
Jobban adjustments ( #16319 )
...
* Borer ban
* Terror Spider jobban category
* Defines
2021-07-09 11:39:01 +01:00
1d04a9ec74
AI Detector can now only detect AI, not Abductors, Xenobio consoles or Shuttles ( #15535 )
...
* Update navigation_computer.dm
* V7
* Update navigation_computer.dm
* All instances
* Added explainers
Seems this is done some places, seems nice and easier to understand with em
* Updated name
* Change Variable name
Changed as per advise of Fox
2021-07-08 23:18:15 +01:00
c303a2b3f2
Merge remote-tracking branch 'upstream/master' into just-defibrillator-things
2021-07-09 00:03:38 +02:00
92bdb8f159
Makes gluon grenades use ice instead of permafrost ( #15577 )
...
* Makes gluon grenades use ice instead of permafrost
* Makes it only select floor turfs
2021-07-08 22:58:44 +01:00
04c689817e
Fire + Cloth = Bad things ( #15635 )
2021-07-08 22:57:08 +01:00
d85f2261e5
Fixes firing flamethrowers when you cannot fire guns ( #15935 )
...
* fixes
* code review
* code review
* Henk review 2
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2021-07-08 22:35:23 +01:00
a598acf159
General Bugfixes + Closing Issues ( #15936 )
...
* Prevents Species Action Icons from Duplicating
* Spelling Correction for Igniter
* Guardian Fixes
* Photocopier bugfix
* another spelling fix
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com >
* removes redundant item_state declaration
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com >
2021-07-08 22:33:59 +01:00
b949b1adc2
Adds sec hailers and space pod keys to sec belt ( #15977 )
2021-07-08 22:31:06 +01:00
8719801295
Bandolier stacks ( #16106 )
2021-07-08 22:22:59 +01:00
8dcb2c1a0f
Prevents final summon rune by being cleaned by normal methods ( #16224 )
...
* Prevents final summon rune by being cleaned by normal methods
* Makes it a proc
* Moves cleanable, makes it work with space cleaner
2021-07-08 22:20:32 +01:00
c56c14fda8
Merge remote-tracking branch 'ParadiseSS13/master' into tg-ids
2021-07-07 15:00:35 +01:00
f5af21b794
Merge pull request #16213 from AffectedArc07/nukes-awful-code
...
Removes some oldcode
2021-07-07 09:57:16 -04:00
15b32b7283
Merge branch 'master' into holy-chapel
2021-07-05 18:12:02 -07:00
705a013445
i do
2021-07-05 22:44:30 +01:00
3efc77a9e8
fixes spelling error. ( #16308 )
2021-07-05 18:27:53 +01:00
f4e07cd148
Fixes a glaring grammatical error in the matter bin's description. ( #16299 )
...
* How did this get past S34N?
* Round 2, cleanup
2021-07-04 11:42:54 +01:00
1b1f49ac81
Adds the Emergency Extraction Flare ( #16220 )
...
* Adds the Emergency Extraction Flare
* removes extra message
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: dearmochi <shenesis@gmail.com >
* All I ever get, is a pain in the ash... 🎵
* Affecteds requests part 1
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
* Use populate_contents
* Update code/modules/mining/equipment/wormhole_jaunter.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: dearmochi <shenesis@gmail.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-07-02 21:32:45 +01:00
15b7a76c91
Fixes syndicate teleporter saving throw bug ( #16287 )
2021-07-02 19:39:58 +01:00
7413256cb8
Prevents ghosts from setting off mousetraps ( #16274 )
...
* Prevents ghosts from setting off mousetraps
* Update code/game/objects/items/weapons/storage/storage.dm
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com >
* Note to self: Do not be tired when commiting suggestions
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com >
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com >
2021-07-02 16:20:12 +01:00
bcb0cbe5cb
Prevents built APCs from being hacked, Prevents AI from loosing points from apc destruction ( #16192 )
...
* Prevents built APCs from being hacked, prevents deconstructing apcs from removing malf points
* Spacing
* whoops
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
* Affecteds other suggestions.
* Grammer changes
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* And autodoc for steel
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2021-06-29 11:44:18 +01:00
aec95fed48
Merge branch 'master' into holy-chapel
2021-06-28 20:31:34 -07:00
e4461eac09
Please don't break
2021-06-28 19:12:39 -04:00
c266b27aed
Another small bugfix bundle ( #16260 )
...
* Closet examine
* Lit welder inhands
* Capitalisation
* Cyber organ eating
* Nukie reinforcements code
* Welding tool lathe cost
* Patch pack dropping
* Welding tool fix
* Spacing
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-06-26 22:57:27 +01:00
6080189ea3
Fixes powersink not giving you a beacon on purchase. ( #16255 )
...
* powersink gives you a beacon, as described
* no longer a bomb subtype
* Update code/game/objects/items/devices/radio/beacon.dm
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com >
* Update code/game/objects/items/devices/radio/beacon.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-06-26 21:34:08 +01:00
672f900b40
fixes RPD eating TEG circulators ( #16258 )
2021-06-26 14:36:40 +01:00
eb5fa5080c
Update robot_upgrades.dm ( #16248 )
2021-06-25 18:48:04 +01:00
e4d1788088
Fixes singulo hammer sucking in ghosts ( #16247 )
...
* fix
* review
2021-06-24 20:02:32 +01:00
ed11899f11
Merge branch 'master' into toml-config
2021-06-23 08:44:32 +00:00
7c6e19850a
Merge branch 'master' into solgov_ERT
2021-06-22 10:37:32 +01:00
b45ee602bd
Merge remote-tracking branch 'upstream/master' into flyswatter-fix
2021-06-21 21:03:30 +01:00
0b375de42c
Removes the the vast majority of 'The the' from the the code ( #15597 )
...
* The the
* Some more
* Review 1
* A couple more
2021-06-20 10:20:32 -04:00
fc3185dcb6
fix ( #16209 )
2021-06-19 23:07:50 +01:00
841eb0d309
And this
2021-06-19 19:04:00 +01:00
aed6fed004
Removes some oldcode
2021-06-19 18:56:48 +01:00
dd02435095
Fixes secborg batons ( #16196 )
...
* Cell linking
* V2
2021-06-19 14:10:01 +01:00
00de6dc6c1
Adds pref to remove internals pressure from status tab, adds it to inspect text ( #16110 )
...
* yeets the internals from status panel
* adds pressure reading to the tank inspect text
* Adds a pref toggle
* numbers are hard
* catchup with master
* Revert "catchup with master"
This reverts commit bb972cb110
2021-06-17 10:30:30 +01:00
c55acec92b
Makes E-Bolas as they should be. Noncyborg variants. ( #16168 )
...
* The E-bola is not a cyborg variant.
Returns E-bola break out time to 60, instead of 20.
Security bolas are limited supply and should be better then makeshift ones.
* whoops
Adjusts the breakout time to not to default to beartraps and use the 6 seconds listed in the Ebola item.
* Update code/game/objects/items/weapons/legcuffs.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-06-17 10:25:24 +01:00
75375efce9
Why is this a thing, really ( #16169 )
2021-06-17 10:23:14 +01:00
4d26621d0b
Fixes being unable to pickup the armblade nullrod on mining ( #16189 )
2021-06-16 10:02:58 +01:00
277b14275d
hardsuit pass 1
2021-06-15 00:55:42 +01:00
ba45742fe9
loadout update, armour tweaks
2021-06-13 16:56:57 +01:00
efed543f47
Merge remote-tracking branch 'ParadiseSS13/master' into toml-config
2021-06-13 14:15:07 +01:00
5896bd2c8e
Fixes some exploits ( #16134 )
2021-06-07 18:46:16 +01:00
9d10cf4260
Fixes soulstones ignoring DNR or AntagHUD settings ( #16117 )
...
* DNR/AntagHUD soulstoning
* Update code/game/gamemodes/wizard/soulstone.dm
Co-authored-by: dearmochi <shenesis@gmail.com >
* Revive rune
Co-authored-by: dearmochi <shenesis@gmail.com >
2021-06-06 12:43:28 +01:00
Farie82