Commit Graph

20121 Commits

Author SHA1 Message Date
Heroman
2e230617ba Restricts surgery through voidsuits 2020-02-04 09:59:22 +10:00
Heroman
bf8cf75785 Applies same restrictions as first aid to external synth repair 2020-02-04 09:17:09 +10:00
Woodratt
512fe09064 2020 Civilian Overhaul
- Added sofas (no options to build one in round yet, will be added after this pull).
- Add neonsigns, currently one neon sign, Cafe. (Code is copy pasta from holosigns).
- Add boxes with mugs and cups.
- Neon signs and holosigns now emit light while on.
- Merged the Coffee Shop with the Library.
- Moved the Locker Room to where the Coffee Shop was, adjusted the holodeck.
- Old Locker Room turned into a construction area.
- Adjusted holodeck maps to new orientation.
- Changed sprite of barcode scanner.
- Cleaned up furniture icon dmi, fixed arm rest icons for shuttle chairs.
2020-02-02 23:58:26 -08:00
PrismaticGynoid
f8ffd25caf Adds some toys to the loadout
Adds a few toys, including action figures, to the loadout. Also fixes water flowers being unrefillable.
2020-02-01 20:16:30 -08:00
Atermonera
445b6cfaf0 Merge pull request #6661 from LeighKnapenberger/patch-1
Fixes killer tomato mutation
2020-02-01 15:08:13 -08:00
Atermonera
139c4a3d70 Merge pull request #6658 from Darlantanis/TeshariPonchoFix
Teshari Poncho Fix
2020-02-01 15:00:22 -08:00
Cerebulon
80f81b8725 Fixes antibiotic resistance being reset when copied to new datum instance (#6654) 2020-01-31 20:45:38 -08:00
LeighKnapenberger
44d4986a2e Update seed_datums.dm 2020-01-31 00:16:22 -05:00
Atermonera
80bc4bdfae Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no
Hacky Fix for Athletic Shorts showing Missing Icon
2020-01-30 16:23:25 -08:00
Nadyr
26b5e7aedb -Adds a metamorphic pint glass
-Adds said glass to the booze-o-mat
-Adds the icon for said glass
-Fixes metaglass icons for mojito and goldschlager
2020-01-28 23:33:22 -05:00
Nadyr
71f69815e7 Sets icon override to use teshari sprites when ponchos are worn by teshari. Otherwise it just uses ties.dmi as normal. 2020-01-28 22:19:36 -05:00
Atermonera
3af55c5f89 Merge pull request #6651 from Cerebulon/ClothingExpansionPort
Ports Clothing Expansion Code from World Server
2020-01-28 11:15:31 -08:00
Atermonera
29b7736e14 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix
Fixes constant stacking machine runtimes
2020-01-28 11:12:35 -08:00
Rykka
96c2265577 Hacky Fix for Athletic Shorts showing Missing Icon
Athletic Shorts (standalone) have the redshorts icon.
2020-01-27 19:21:03 -07:00
Cerebulon
7b9cf01c5c Ports clothing expansion code from worldserver 2020-01-26 04:45:57 +00:00
Atermonera
09a8cde7af Merge pull request #6603 from Rykka-Stormheart/shep-dev-sm-delam-alarm
Add an audible alarm sound to SM Delamination
2020-01-25 19:25:04 -08:00
Atermonera
59b0fe497b Merge pull request #6649 from Trexdude/patch-1
Fixes Bagel Poppy Recipe
2020-01-25 19:16:05 -08:00
Atermonera
bd7271db07 Merge pull request #6637 from Mechoid/AugmentsRespectBeds
Augments Respect Beds, Robotic
2020-01-25 19:12:39 -08:00
Shadow
ebe2fdfad8 Fixx 2020-01-25 20:23:25 -06:00
Trexdude
298c9a5f0f Fixes Bagel Poppy Recipe
Such that crafting it using a microwave actually spawns a poppy bagel, instead of a raisin bagel.
2020-01-24 18:38:06 -05:00
Atermonera
d0a488d9a7 Preset (mapped-in) modular computers now have printers by default. (#6639) 2020-01-23 20:54:48 -08:00
Schnayy
18199a5dfd Adds book cart to library (#6645) 2020-01-23 20:51:38 -08:00
Schnayy
0b8ca6267d Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 20:50:53 -08:00
Mechoid
a1f785d282 Update augment.dm 2020-01-23 15:43:25 -08:00
Mechoid
8e0b2f11dc FixWaterA G A I N 2020-01-23 13:39:45 -08:00
Atermonera
46418f1d36 Merge pull request #6638 from Mechoid/BumpGameMasterTime
Drops the time between events possible duration.
2020-01-21 15:12:16 -08:00
Atermonera
ea8bf0ad0b Merge pull request #6630 from Novacat/nova-alerts
IP reputation checking
2020-01-21 15:10:27 -08:00
Novacat
53202480bb Update client procs.dm 2020-01-21 01:42:26 -05:00
Atermonera
9684db1fe4 Merge pull request #6636 from SpaceManiac/patch/syntax
Fix various syntactic problems
2020-01-20 22:05:25 -08:00
Mechoid
a26cf77c52 Convert The Cake to microwave recipe type. 2020-01-20 21:06:31 -08:00
Mechoid
fff1438a50 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into TheGreatMicrowaveMigration
# Fix Conflicts:
#	code/modules/food/kitchen/microwave.dm
2020-01-20 21:03:57 -08:00
Atermonera
0dbcdf6e55 Merge pull request #6628 from Ketrai/cakebranch
Adds a mega cooking recipe
2020-01-20 20:14:07 -08:00
Atermonera
50d9274819 Merge pull request #6622 from Mechoid/WaterResistanceExists
Water resistance exists
2020-01-20 19:51:35 -08:00
Atermonera
5d5e361649 Merge pull request #6621 from Shadow-Quill/Desc-Adds
Moar descriptions for things
2020-01-20 19:48:57 -08:00
Mechoid
19c236d93c Drops the time between events possible duration. 2020-01-19 14:50:52 -08:00
Mechoid
6cd803be7e Augments that deploy items can no longer be used when strapped to a bed or other lying-restraint. 2020-01-19 14:24:46 -08:00
Tad Hardesty
f44d31451e Fix remaining diagnostics 2020-01-18 23:01:36 -08:00
Tad Hardesty
d8a64c83dc Use compatible var statements 2020-01-18 23:01:36 -08:00
Tad Hardesty
7bd3208cc6 Fix loop and control flow syntax 2020-01-18 23:01:36 -08:00
Tad Hardesty
6ed5f8de4b Replace () with null where appropriate 2020-01-18 23:01:36 -08:00
Tad Hardesty
644347cfeb Remove stray . and ..() 2020-01-18 23:01:36 -08:00
Ketrai
6db1d29836 Ports deathbell because the recipe requires it. 2020-01-18 12:43:29 +01:00
Shadow-Quill
1f77cba62f Alert Revert (#6631) 2020-01-17 00:48:27 -08:00
Unknown
edb88b7e60 Adds a verb 2020-01-16 15:21:03 -05:00
Verkister
aee06aec3d Fixes loadout index runtime spam (#6626)
sanity checks saving the day once more.
2020-01-15 23:55:45 -08:00
Mechoid
4504d9dfe7 Update human_defense.dm 2020-01-15 23:49:18 -08:00
Mechoid
274b1e06ac Moves microwave recipes to their own subtype of the recipe datum, freeing it from the torment of being used solely for food. 2020-01-15 23:46:05 -08:00
Atermonera
929ba9c96b Merge pull request #6620 from Heroman3003/eventpause
Pauses event processing while doing event actions
2020-01-15 20:43:25 -08:00
Atermonera
6b736d9ec0 Merge pull request #6617 from Shadow-Quill/Paper-Pen-Confirmation
Adds holding pen check + alert
2020-01-15 20:41:51 -08:00
Atermonera
4284dd784c Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
Can now (de)construct chem masters
2020-01-15 20:15:33 -08:00