Commit Graph

3693 Commits

Author SHA1 Message Date
AffectedArc07
2c37ae8fd0 The road to Initialize() stability - Enforcing parent call on New(), Initialize() and Destroy() (#14719)
* The road to Initialize() stability

* Fixes sanity, for now
2020-10-28 12:35:36 -04:00
Mitchs98
ce302657ec Makes Canes Bigger (#14705)
* Cane Big

* Medium does not exist
2020-10-26 23:50:28 -04:00
Iren
26486a2261 Combat Defib - Cell Change (#14698)
* Combat Defib - Cell Change

* Source has been Implied

* Affected doesn't like Space

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-26 20:01:01 -04:00
AffectedArc07
bb6a31ae10 TGUI RPD (#14702) 2020-10-23 16:08:07 -04:00
PacifistDalek
f312297f9d A variety of minor food related fixes and tweaks (#14656)
* Changed Milo to Miso

* Update baked_goods.dm

* typo fix

* Revert "typo fix"

This reverts commit 3f6ca6a5b9.

* Revert "Revert "typo fix""

This reverts commit b67ed80d8d.

* Update food.dm

* removing beff and pepperoni

* adding onions as juiceable

* made drying grapes give you homemade raisins since homemade raisins were already in the code

* undo the onionjuice because it crashed my test server

* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge

* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)

* Moved onion rings to the deepfryer instead of microwave

* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)

* made macaroni and cheese names consistent

* moved two recipes to oven from microwave

* Wine comes from grapes ya dingus

* name fix

* made burger recipes consistent except for the big bite and super big bites

* yaki imo is baked whole sweet potato, not processed!

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* made food names consistently lower case

Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger

* Missed one

* Back to american mac 'n' cheese spelling

* Macaroniiiii

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-21 09:40:27 -04:00
Darkmight9
8782c2ca32 Culinary QoL update (#14610)
* Culinary QoL update

* Changed the culinary tool apron sprites
2020-10-17 13:30:44 -04:00
Iren
4a21b6787f Code Standarisation - Tank Distribute Pressure (#14562)
* Code Standarisation - Tank Types

* Tank Distribute Pressure Standardisation

* Anesthestic Tank at O2 Standard

* Update tank_types.dm

* Distribution Pressure Fix

* TANK DEFAULT RELEASE PRESSURE
2020-10-17 13:16:46 -04:00
SteelSlayer
01e81b98d1 affected pass 2 2020-10-16 16:14:18 -05:00
SteelSlayer
6b3c022be6 affected first pass 2020-10-16 16:14:06 -05:00
SteelSlayer
3a23a6b5b8 tgui rcd 2020-10-16 16:14:06 -05:00
AffectedArc07
f40a8163ff Codebase Cleanup - 2020-09-27 (#14472)
* Codebase Cleanup - 2020-09-27

* Endings

* Forgot meta

* Farie Tweaks
2020-10-15 13:22:52 -04:00
Qwertytoforty
e596560604 Prevents flash / sonic powder from working on blob tiles again. (#14559)
* Prevents flash / sonic powder from working on blob tiles again.

* Update code/game/objects/items/weapons/grenades/flashbang.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-14 23:43:03 -04:00
ZEUS\samcr
70c5d4b987 IPC First Aid Kit No Longer Has Oil 2020-10-09 14:35:44 -04:00
AffectedArc07
3ee7d2e89e Merge pull request #14525 from FlattestGuitar/oc-donut-steel
fancier donut boxes
2020-10-08 17:11:42 +01:00
Mieszko Jędrzejczak
2d83dbdde0 /
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-06 14:00:36 +02:00
FlattestGuitar
153147bcba donut box improvements 2020-10-03 20:34:33 +02:00
SabreML
3f8ee9b375 Removes 'bnotice' span class 2020-10-02 16:17:26 +01:00
Kyep
aa300ea6b8 Fixes #13702 - wizard scroll produces zlevel error 2020-09-26 20:24:04 -07:00
Kugamo
2e8c9775b6 Inhand Trashbag Sprites (#14418)
* sprotes

* small alteration to sprites, and realtime updates to inhand icon
2020-09-25 16:10:16 -04:00
Kyep
9a3ecd6383 Fix runtime when activating internals while smoking 2020-09-24 14:00:39 -07:00
SteelSlayer
01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196)
* proximity monitor

* Update code/__HELPERS/unsorted.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-20 13:31:16 -04:00
farie82
81682dc626 Adds muzzle flashes for guns depending on the ammo (#13322)
* Muzzle flashes added for guns

* Use an muzzle flash effect now.

* Unused var

* sillenced guns have a lower alpha muzzleflash effect
2020-09-20 12:41:45 -04:00
Dovixx
b35a9f3af3 Add the checks 2020-09-19 23:16:59 +03:00
AffectedArc07
ce2f0d401d Swings the axe on modular consoles (#14355)
* Swings the axe on modular consoles

* Experience will not save you in these parts
2020-09-19 09:36:56 -04:00
AffectedArc07
c5fece9cfe Merge pull request #14383 from TDSSS/donk-fix
The return of the donk
2020-09-19 14:06:29 +01:00
TDSSS
6e7ca4000f fix donks 2020-09-19 14:51:10 +02:00
TDSSS
33f600d0d3 Spray logging improvement (#14331)
* better logging

* now with target
2020-09-18 19:41:46 -04:00
dearmochi
101ad5b617 Ports security webbing from /tg/ (#14354)
* Ports security webbing from /tg/

* Can only be purchased from cargo (15 pts for 3)
2020-09-18 18:53:42 -04:00
farie82
229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)
* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes
2020-09-18 11:07:19 -04:00
TDSSS
328b7fa8d8 ERT idiotproofing and minor tweaks (#13834)
* makes ert more robust

* renamed and tweaked

* idiot proofing of ert

* I cannot into git, oops

* removed the anti-stun from code red erts again

* removed implied src
2020-09-16 16:38:25 -04:00
AzuleUtama
8cf7051cb9 Energized fire axe rework (#13907)
* Energized axe reworked and now subtype of regular axe
2020-09-16 15:36:39 -04:00
AffectedArc07
c5597b9372 Merge pull request #14291 from Kyep/tgui_id_computer
[TGUI] ID Computer
2020-09-16 20:10:42 +01:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
Kyep
7b78232276 Reworks Baseball Bat (#14186)
* Adjusts baseball bat

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-16 10:16:21 -04:00
Kyep
eb464ebd24 fixes merge conflict 2020-09-16 06:54:30 -07:00
joep van der velden
0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
variableundefined
a6d6d0591d Merge pull request #13489 from AzuleUtama/uplinkBundleTweaks
Improves Hacker and Payday uplink bundles
2020-09-16 09:02:54 -04:00
Kyep
07b4ff1354 merge conflict fix 2020-09-15 17:04:39 -07:00
variableundefined
db06596ffa Merge pull request #14283 from SabreML/Fire-Lighting
Makes cigarettes catch fire if their holder is also on fire
2020-09-15 19:41:02 -04:00
Kyep
00b458be3e fixes merge conflict 2020-09-15 15:34:50 -07:00
AffectedArc07
e12701c453 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14022 2020-09-15 16:23:11 +01:00
Kyep
4e44253af3 fixes merge conflict, updates to master 2020-09-15 00:31:56 -07:00
variableundefined
3a3ff1400a Merge pull request #13447 from EMPlight/BulldogXLmag
Adds Bulldog extended drum mags and bundle for nuke ops.
2020-09-14 16:45:04 -04:00
variableundefined
f5b7554c1a Merge pull request #12851 from SteelSlayer/internals-auto-push-up
Activating internals automatically pushes breath masks into place
2020-09-14 16:02:45 -04:00
Kyep
933a2f4e34 lastlog, dept_demote, refactor 2020-09-12 23:42:58 -07:00
AffectedArc07
706dc6e3c6 Merge pull request #14233 from RedWolfie/chameleon
chameleon flag fix
2020-09-12 23:45:09 +01:00
SabreML
3aea152a93 Fixes
Changed 'Your' to 'The', since it's a 'visible_message'.
Also removed implied src
2020-09-12 16:43:39 +01:00
SabreML
af2ea50764 Cigarettes catch fire 2020-09-12 15:38:57 +01:00
joep van der velden
062f275b6c On tray not cyb tray 2020-09-12 10:34:31 +02:00