cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,980 Commits 5 Branches 0 Tags
f7466786200c9361e2d481be4534b4be546638db
Commit Graph

70 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
f7de0bb70b [MIRROR] Start of TG Click Code Port (#12071) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-12-06 03:18:32 -05:00
CHOMPStation2StaffMirrorBot
1b8f394a14 [MIRROR] Makes uses of do_after sane (#11582) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-09-07 23:02:27 -04:00
CHOMPStation2StaffMirrorBot
4e2361f8df [MIRROR] Encode changes (#11301) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-08-05 01:23:19 +02:00
CHOMPStation2StaffMirrorBot
2c9453b5c3 [MIRROR] var/global/list -> GLOB. conversion (#11193) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-07-16 00:24:42 +02:00
CHOMPStation2StaffMirrorBot
f04f992cfe [MIRROR] code/global.dm => code/_global_vars/ (#10689) 
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-04-21 19:16:48 +02:00
CHOMPStation2StaffMirrorBot
55d696e503 [MIRROR] next new to init (#10524) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-24 22:10:59 +01:00
CHOMPStation2StaffMirrorBot
a245b8687f [MIRROR] usr to user part two (#10015) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-31 22:27:34 +01: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
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
15863e00f8 [MIRROR] Undefines local defines and moves global to __define (#8502) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-09 18:26:41 +02:00
Raeschen
e29b9d4d35 Reversions and fixes (#7889) 
Co-authored-by: Selis <selis@xynolabs.com>
 2024-03-06 18:20:29 +01:00
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
Heroman3003
5738a980d4 Merge pull request #14926 from Youtubeboy139/Grammar1 
Some Grammar Fixes
 2023-05-31 02:14:24 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Chompstation Bot
9acfa8fcca SMART Rifle 2021-08-05 21:48:45 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
ForFoxSake
ed1d9a8a04 Adds tg-style fast(ish) magazine restocking. (#7391) 
* Allows magazines to be reloaded automatically from piles of bullets.

* Fixes usr, adds changelog.
 2020-08-06 14:24:03 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Spades
41e8615c4e Introduces caseless ammo, and a caseless rifle 2019-02-07 00:35:27 -05:00
Kates
26089f3a72 Magazines improvements 2018-10-15 15:52:56 -04:00
Anewbe
ee48151135 Adds smart magazine, magazine functionality 2018-08-21 17:10:40 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Cameron653
e158fcd3cc Macro Replacements. (#3574) 
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
 2017-07-19 12:47:23 -05:00
Spades
be2a99ca32 Some ammo fixes 
- Fixes pirate gun not getting 12g caliber correctly.
- Fixes .357 caliber not being named consistently with everything else.
(Do not merge this until
https://github.com/PolarisSS13/Polaris/pull/3533 is merged pls, unless
Yosh fixes his caliber to be correct also.)
- Changes .50AE ammo to .44 because that's more consistent with what the
gun is capable of in-game, because it uses the same damage values as the
.357 and not a bullet that shoots through through your fridge, through
your house, and hits your neighbor's home invader like a .50AE is IRL.
The fact that it's .44 makes much more sense. This is purely a fluff
change because it annoyed me.
- Fixes a bunch of ammo.dmi icon names and makes the file not a jumbled
fucking mess. This means now your 762 mags and the newly renamed 44 mags
will not be broken anymore.
 2017-06-19 23:44:01 -04: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
Spades
e91d0ddf29 pixel_x and pixel_y now have some offset 2016-07-28 19:57:34 -04:00
Spades
736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup 
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
 2016-03-24 01:23:08 +03:00
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
PsiOmega
83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-05-16 22:38:01 +02:00
mwerezak
29609f7ec6 Fixes #8985, ammo magazine examine grammar. 2015-05-15 23:04:50 -04:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
mwerezak
ad24aa8e47 Adds mercenary sniper rifle 
Adds the scoped mercenary sniper rifle and ammunition defines. Does not
add syndicate uplink option.
 2015-02-14 22:33:43 -05:00
mwerezak
8cb3c6a821 ammo_magazine icon state data caching 2015-02-14 01:33:55 -05:00