cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-08 15:41:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,998 Commits 10 Branches 0 Tags
8a4c185fb4a8564bed0f97912e86e3cda06fdecf
Commit Graph

52 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
ce2446922e [MIRROR] Initialize fixing (#10335) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-08 22:22:04 +01:00
CHOMPStation2StaffMirrorBot
fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-12 02:11:06 +01:00
CHOMPStation2StaffMirrorBot
6eafc8c9d0 [MIRROR] maptest redgate (#9462) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-10 06:22:45 +01:00
CHOMPStation2
7416cbea22 [MIRROR] next set of spans (#9247) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-18 01:33:07 +02:00
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
31407a0be3 [MIRROR] First part of a span rework (#9120) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-02 16:25:48 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
CHOMPStation2
4153768ba1 [MIRROR] Job rank and radio channel rework (#8965) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-17 21:24:13 +02:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
9d2f15e494 [MIRROR] Adds food vore (#6858) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-23 15:13:38 +02:00
Aronai Sieyes
0f6e69f344 Merge pull request #11533 from VOREStation/upstream-merge-8236 
[MIRROR] Allows wiping food off cutlery
 2021-10-22 17:52:40 +00:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 16:18:08 +00:00
Aronai Sieyes
5e675845de Merge pull request #10789 from VOREStation/Arokha/eriskitchen 
Port Bay microwave, utensil/kitchen knife sprites
 2021-07-04 00:38:10 +00:00
Novacat
571025d718 Merge pull request #10694 from VOREStation/upstream-merge-8140 
[MIRROR] Refactors utensils to use weakrefs
 2021-06-19 13:44:00 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Anewbe
6e4a77f010 Boot knives fit in boots 2018-09-19 15:42:08 -05:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Cerebulon
843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
Anewbe
734536bcb9 Material weapon rework 2017-02-24 18:51:44 -06:00
Neerti
828dacf485 Centralizes weight class definitions 
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
 2016-09-22 00:51:51 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Yoshax
e2c66a3bf2 Weapon sharpness and edge adjustments 2016-05-12 16:13:41 +01:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound. 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2016-04-22 04:58:25 -04:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
PsiOmegaDelta
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous. 
#11370
 2015-12-16 20:07:35 +03:00
Zuhayr
1ea7aebb62 Added boot knives and putting a knife in your boot. 2015-12-11 15:55:23 +10:30
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
 2015-10-25 20:28:48 +01:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means. 
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
 2015-10-22 16:52:07 +02:00
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00
mwerezak
068d02c28c Refactors various item attack() implementations 
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
 2015-09-08 23:39:33 -04:00
PsiOmegaDelta
9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
mwerezak
01104eda45 Fixes utensil force dividers. 
Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.
 2015-07-08 01:37:07 -04:00
GinjaNinja32
c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
Zuhayr
ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Zuhayr
b8ca15f541 Tweaks/fixes and greyscale icons. 2015-05-17 00:07:29 +09:30