variableundefined
f9d6300bc9
Merge pull request #15678 from S34NW/gammadoesnotgrantguns
...
Gamma alert ≠ Gamma armoury
2021-07-26 14:00:12 -04:00
variableundefined
7912fae83b
Merge pull request #15354 from Qwertytoforty/My-turn-to-try
...
Adds a heal point system to the rod of Asclupius
2021-07-26 13:57:28 -04:00
Qwertytoforty
076cbba3c4
Aaaand extra brackets I forgot
2021-07-26 13:51:57 -04:00
variableundefined
699c4575a1
Merge pull request #15619 from TDSSS/camera-alarm-removal
...
Removes camera alarms
2021-07-26 13:51:42 -04:00
Qwertytoforty
2eb5e26aba
Final changes
2021-07-26 13:50:33 -04:00
Qwertytoforty
2523dc90bc
Update code/datums/status_effects/buffs.dm
...
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
2021-07-26 13:47:06 -04:00
variableundefined
ec7206e612
Merge pull request #15599 from SabreML/flyswatter-fix
...
Fixes the flyswatter not swatting flies
2021-07-26 13:36:54 -04:00
LordShekelstein
ab0fac5d04
Gives the Singularity Hammer a much needed buff. ( #16276 )
...
* buffs the singularityhammer
* Sets the force back to 5... why did I put a 1 there?
2021-07-26 18:13:01 +01:00
Qwertytoforty
c65a472888
Adds the BSG to RND designs ( #16328 )
...
* Adds the BSG to RND designs
* Update code/modules/research/designs/weapon_designs.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2021-07-26 18:12:37 +01:00
SabreML
2c0ae9c500
Refactors the 'Examine' status tab ( #16330 )
...
* Removes the 'Examine' tab
* Revert "Removes the 'Examine' tab"
This reverts commit 0dd01722c9
2021-07-26 18:11:57 +01:00
warior4356
c7f4c82dfe
Balaclava bug fix and sprite tweak ( #16341 )
2021-07-26 18:10:00 +01:00
SabreML
82b7eaba8c
Discord notification ( #16351 )
2021-07-26 18:09:29 +01:00
hal9000PR
7906e66871
Adds feedback for defibbing and scanning husked people ( #16357 )
...
* husk
* extra space
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
2021-07-26 18:08:37 +01:00
Qwertytoforty
8267ff7991
Lets CC relay link to tcomns cores without password ( #16386 )
2021-07-26 18:07:20 +01:00
SabreML
9fee857b80
Cell Timers ( #16390 )
2021-07-26 18:06:29 +01:00
Qwertytoforty
ca9b3af9be
Makes cyborgs have a dust animation, allows admins to dust smite anything ( #16392 )
...
* Makes cyborgs have a dust animation, allows admins to dust smite anything
* Apply suggestions from code review
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
* whoops
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
2021-07-26 18:04:23 +01:00
SabreML
63412043ee
Fixes an SQL error from maximum name length ( #16305 )
...
* Reduces maximum name length
* Revert "Reduces maximum name length"
This reverts commit 7d0fe75c54
2021-07-25 15:51:47 +01:00
datlo
01dfe5c7b7
Remove freeform core quotes ( #16423 )
2021-07-25 15:50:40 +01:00
variableundefined
09a5988ce2
Merge pull request #16147 from S34NW/rad_damage_normalise
...
Increases most radiation dose amounts
2021-07-25 09:15:40 -04:00
variableundefined
53f489d766
Merge pull request #16132 from Leanfrog/Sec-Bomber-Jacket-Armor-+-Loadout
...
Standardizes Sec Bomber Jacket Armor And Adds To Loadout
2021-07-25 09:15:08 -04:00
variableundefined
7526d01c67
Merge pull request #15760 from hal9000PR/FUSION-FRENZY
...
Adds an interaction between two SMs when they collide.
2021-07-25 09:01:00 -04:00
variableundefined
5d3e3b2424
Merge pull request #15714 from Kepplerx/Atmos-Check
...
Vents and Scrubbers can be placed 180 degrees on each other, with a max of 4 total each tile
2021-07-25 08:42:07 -04:00
Samman166
64349fa7db
Adds hardened versions of thermal and x ray eyes and replaces old ones bought by nuke ops ( #16055 )
...
* Adds hardened versions of thermal and x ray eyes and replaces old ones bought by nuke ops
* Update code/modules/surgery/organs/eyes.dm
grammar changes
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* gives SOOs hardened X-ray eyes
* Grammar fix
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2021-07-25 13:38:43 +01:00
variableundefined
b9aa1facce
Merge pull request #15757 from warior4356/holy-chapel
...
Makes the chapel holy once more.
2021-07-25 08:37:18 -04:00
variableundefined
ea316e7fca
Merge pull request #15902 from AffectedArc07/tg-ids
...
"New" ID card sprites
2021-07-25 08:27:28 -04:00
variableundefined
d91c8ba479
Merge pull request #15980 from AffectedArc07/toml-config
...
[READY] Converts configs to use TOML + Configuration refactor
2021-07-25 08:26:29 -04:00
SabreML
865b19263c
I am an idiot ( #16421 )
2021-07-25 11:37:15 +01:00
datlo
daf2453d15
Add new lawsets and reorganise AI upload, the Third ( #15743 )
...
* lawsets update
* Revert "lawsets update"
This reverts commit a68ddcb9ee06sean@gmail.com >
* Update hippocratic per review
Co-authored-by: Sean Williams <06sean@gmail.com >
* Update hippocratic per review
Co-authored-by: Sean Williams <06sean@gmail.com >
* Fix merge conflict
* Update code/game/objects/items/weapons/AI_modules.dm
Co-authored-by: dearmochi <shenesis@gmail.com >
* Add a pilot seat to the ERT shuttle
* Revert "Add a pilot seat to the ERT shuttle"
This reverts commit 676bfa7d0325063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: Sean Williams <06sean@gmail.com >
Co-authored-by: dearmochi <shenesis@gmail.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-07-25 10:19:58 +01:00
warior4356
ab2268f66a
Fixed Golems escaping servitude with new bodies ( #16340 )
...
* Fixed Golems escaping servitude
* Keeps free golems free
2021-07-25 10:14:44 +01:00
warior4356
e091faaef9
Fixed IPCs and Golems unequipping jumpsuit slot items on update ( #16338 )
...
* Fixes IPCs and Golems unequipping
* Formatting fixes
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
2021-07-25 10:14:13 +01:00
SteelSlayer
6a72cdb79a
[TGUI] Cyborg self diagnosis report ( #16345 )
...
* tgui diagnosis
* mochi and sabre review
* final tweaks (maybe)
moves getDamageColor out of component
makes silicon subsystems GC better
* Update tgui.bundle.js
2021-07-25 10:10:44 +01:00
hal9000PR
48ad06e033
ughhh ( #16419 )
2021-07-24 23:39:31 +01:00
Adrer
beca3b43b5
Prevents labels from stacking up when entering and exiting cryopods ( #16417 )
...
* Set name back to initial on exit.
* Remove unneeded change
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2021-07-24 20:36:32 +01:00
SabreML
fe6e445760
Manual ore redemption ( #16414 )
2021-07-24 10:26:07 +01:00
variableundefined
dc9ce6dad7
Merge pull request #16405 from AffectedArc07/removes-headcrabs
...
Removes headcrabs
2021-07-21 05:12:10 -04:00
dearmochi
3938f6d0ad
Fix floor painters being able to paint non-floor ( #16404 )
2021-07-21 08:30:57 +00:00
SabreML
150e7e3f60
Painter Item Refactor ( #15828 )
...
* Modular Painter V1
* Improved Suicide
* Type & Text
Also `item_state` just goes from `icon_state` so it's not needed.
* Modular Painter V2
Big refactor of everything to use datums rather than separate objects.
* Steel airlock stuff
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Vile Heresy
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com >
2021-07-20 15:25:45 +01:00
AffectedArc07
f91883814d
Merge remote-tracking branch 'ParadiseSS13/master' into removes-headcrabs
2021-07-20 10:27:35 +01:00
SteelSlayer
dab535ef16
cyborg laser fix ( #16399 )
2021-07-20 08:18:28 +00:00
hal9000PR
c5e593b2bf
fix ( #16388 )
2021-07-19 00:33:23 +01:00
SteelSlayer
fbda59a8f5
slime-iv ( #15642 )
2021-07-16 17:34:06 +01:00
S34N
3417b51c9e
Maps in the HoS hardsuit ( #15637 )
...
* Added HoS locker to all maps
* removes sneaky magboots
* Update code/game/machinery/suit_storage_unit.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-07-16 16:13:46 +01:00
warior4356
ba8052af3f
Apply suggestions from code review
...
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-07-15 18:44:23 -07:00
dearmochi
f8d510e7f5
Lightly refactors human Initialize() ( #15738 )
...
* Refactors human Initialize
* spelling
* use ComponentInitialize()
* 🇬🇧
2021-07-15 22:07:24 +01:00
SabreML
b67bab70c6
Adds direction signs around the station [V2] ( #15486 )
...
* Cyberiad Directional Signs
* Mochi Review
* Map edits remake
Conflict fixer didn't work :(
2021-07-15 17:56:55 +01:00
S34N
e3866fda81
Delta brig edits ( #15405 )
...
* Cells moved and added, processing added, evidence moved.
* i did an oopsie with gitignore
* Expanded Perma, added solitary, gamma, and perma maints
* fire alarms
* more fire alarms
* magi office
* Resolved issues
Fixed issues highligted by steelslayer.
Added monitors to interrogation observation, and an intercomm for that area only.
Changed inner airlock doors for non-glass on main entryance and prison wing access.
* Update code/game/area/ss13_areas.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* power cables should actually have a purpose
* forgot to map merge latest stuff innit
* merge conflict part 2
* repipes brig, decal fixes
* merge conflict part 2
* Updated area icon
Co-authored-by: Sean Williams <sw26243@my.open.ac.uk >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2021-07-15 16:38:59 +01:00
hal9000PR
af5ea7b4bf
round two ( #16371 )
2021-07-15 15:51:52 +01:00
Farie82
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
AffectedArc07
62f15c1cf0
Removes headcrabs due to licensing issues
2021-07-15 13:56:03 +01:00
hal9000PR
3eb3bdcdc7
indestructable walls ( #16362 )
2021-07-14 15:01:28 +01:00
