cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-06 06:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,803 Commits 10 Branches 0 Tags
b30356ebd49e335366a7ce17f6ce0aa4674b1749
Commit Graph

10646 Commits

Author SHA1 Message Date
Nadyr
b30356ebd4 Merge pull request #6245 from CHOMPStation2/upstream-merge-14894 
[MIRROR] Adds Aria's medal
 2023-05-29 18:41:55 -04:00
Nadyr
b8778e21ff Merge pull request #6242 from CHOMPStation2/upstream-merge-14880 
[MIRROR] Take me out to the Ball Game
 2023-05-29 18:38:32 -04:00
Nadyr
cc0fcc06e4 Merge pull request #6241 from CHOMPStation2/upstream-merge-14889 
[MIRROR] Baton Safety Tape
 2023-05-29 18:37:50 -04:00
Heroman3003
c83f29cf13 Merge pull request #14894 from Heroman3003/aria-medal 
Adds Aria's medal
 2023-05-25 02:51:12 +00:00
Heroman3003
f0a0c6d506 Merge pull request #14880 from Youtubeboy139/Take-me-out-to-the-Ball-Game 
Take me out to the Ball Game
 2023-05-25 02:12:54 +00:00
Heroman3003
eae88b8870 Merge pull request #14889 from KillianKirilenko/kk-batontweaks 
Baton Safety Tape
 2023-05-25 02:12:49 +00:00
Heroman3003
ee3f93ba50 Merge pull request #14891 from KillianKirilenko/kk-tgfashion 
Dept. Gorka Suits
 2023-05-25 02:12:43 +00:00
Heroman3003
b31bdcc957 adds a smattering of clothes sourced from SR & TG 2023-05-21 23:49:31 -04:00
Heroman3003
dc9fca2f8a Merge pull request #14859 from KillianKirilenko/kk-nanofix 
Mech Nanopaste repairs fix
 2023-05-19 19:03:34 +00:00
Nadyr
03bfc69b7b Merge pull request #6191 from CHOMPStation2/upstream-merge-14842 
[MIRROR] CSC Industrial Voidsuit
 2023-05-11 19:19:18 -04:00
Casey
f6a026e879 CSC Industrial Voidsuit 2023-05-11 18:46:08 +00:00
Verkister
55405efb29 Update stack.dm 2023-05-10 15:17:14 +03:00
Verkister
10404c83ed Makes stack_trace error message a little more descriptive. 
What's worse than vagueposting is vagueposting in runtime logs at spam rate of 36000 messages per hour.
 2023-05-10 15:11:10 +03:00
Verkister
9dc3f22d3a dropping a fat one 
Moves the code and sprites into their own files and fixes a whole bunch of stuff.
Also adds worn icons with 3 options ("full vac-pack", "tube only", and "hidden")
Also added the vac pack into janitor locker contents and into the janitor supply cargo pack.
 2023-05-07 20:00:58 +03:00
Nadyr
3968c7aa1f Merge pull request #6166 from CHOMPStation2/upstream-merge-14828 
[MIRROR] Agent ID Feedback
 2023-04-30 22:25:54 -04:00
Heroman3003
34e44f0c7e Merge pull request #14828 from ReoDaProtovali/AgentCardFeedback 
Agent ID Feedback
 2023-05-01 01:29:11 +00:00
Heroman3003
0f13258b0f Merge pull request #14822 from Heroman3003/ramenratr 
Adds altevian ramenpacks and tacopacks
 2023-05-01 00:57:01 +00:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
Nadyr
2466d8cdba Merge pull request #6137 from CHOMPStation2/upstream-merge-14812 
[MIRROR] Ion Beam Redux
 2023-04-25 22:15:41 -04:00
Heroman3003
317fc95a7e Ion Beam Redux 2023-04-22 05:41:47 +00:00
Heroman3003
91ea1390be Merge pull request #14801 from KillianKirilenko/kk-batontweaks 
Stunbaton Tweaks
 2023-04-20 06:05:33 +00:00
Razgriz
7d23ca2866 Merge pull request #6048 from Sharkmare/patch-26 
Makes contractor IDs suffix "contractor"
 2023-04-18 06:34:27 -07:00
Verkister
d34b34daeb eat. your. greens. 2023-04-16 22:58:37 +03:00
Verkister
aabffe4a95 Update capture_crystal.dm 2023-04-16 20:17:27 +03:00
Verkister
093872c667 Update capture_crystal.dm 2023-04-16 20:15:55 +03:00
Verkister
931c79becc Fixes capture crystal runtime 
Fixes empty capture crystals locking themselves in runtime loop on item gurgles.
 2023-04-16 20:13:03 +03:00
Heroman3003
d10da6fb22 Merge pull request #14767 from KillianKirilenko/kk-shockmaul 
Concussion Maul
 2023-04-14 22:38:34 +00:00
Sharkmare
7a6f071af4 Death Alert EMP Activation is now a Probability 
Should lessen the chat spam a bit
 2023-04-10 00:40:51 +02:00
Nadyr
a0a1350b74 Merge pull request #6018 from FoxglovePurpur/purdevEngieBookUpdate 
Updates Supermatter and R-UST Manuals
 2023-04-06 19:03:08 -04:00
Sharkmare
91e0850f41 Makes contractor IDs suffix "contractor" 
Makes contractor IDs suffix "contractor" after the title name
 2023-04-06 23:13:11 +02:00
Heroman3003
65adc66899 Merge pull request #14760 from MisterGrimm/xenofixes 
Makes xeno egg ghost pods anchored
 2023-04-06 09:24:48 +00:00
Digi Purpur
fa0357b458 Gives R-UST manual its own chomp.dmi 
Creates the obj/library_ch.dmi path and updates the code accordingly
 2023-04-04 00:43:47 -07:00
Heroman3003
264d908ce7 Merge pull request #14751 from MisterGrimm/Xenoeggfix 
Replaces ghetto xenomorph egg, cleans up egg process
 2023-04-02 20:24:49 +00:00
Digi Purpur
bac1d64736 Added a R-UST Manual Sprite 
Added a new sprite called bookRusty for the R-UST reactor manual, as well as replaced the bookSupermatter icon in the code with the bookRusty icon for said manual.
 2023-04-02 04:53:03 -07:00
Digi Purpur
9699d951a7 Fixed comments 
Comments were in the html body and not before/after.
 2023-04-01 21:07:44 -07:00
Digi Purpur
ebade65925 Updating Supermatter Engine Manual 
Edits the Operating Manual for the Supermatter engines throughout the map to instead show new custom text that applies to Southern Cross's standard, rather than the old nitrogen based cooling system.
 2023-04-01 01:10:26 -07:00
Nadyr
9ea10c8f6e Merge pull request #5981 from CHOMPStation2/upstream-merge-14720 
[MIRROR] Speed and stuff
 2023-03-31 18:50:30 -04:00
Razgriz
4718e71c85 Merge pull request #5977 from Seris02/jellyfishnooo 
stops 'the space jellyfish bonks the window harmlessly. x1762'
 2023-03-22 14:36:42 -07:00
Razgriz
c3ce02d546 Merge pull request #5976 from Sharkmare/patch-21 
Brings Communicators further in line with DPAs
 2023-03-22 14:36:26 -07:00
Casey
1138ab35fe Speed and stuff 2023-03-21 21:50:18 +00:00
Nadyr
e6c049ef47 Merge pull request #5970 from CHOMPStation2/upstream-merge-14676 
[MIRROR] Mob tweaks and fixes
 2023-03-20 01:50:02 -04:00
Seris02
08b5274a95 the jellyfish bonks the window harmlessly.x1762 2023-03-20 12:42:03 +08:00
Sharkmare
56b320d093 comment 2023-03-19 20:56:49 +01:00
Sharkmare
41e8e1fa4b Brings Communicators further in line with DPAs 
Allows mounting Comm watches to the belt and ID slot just like the regular communicator (just like the wrist mounted PDA)
 2023-03-19 20:45:59 +01:00
Nadyr
1c4d605536 Merge pull request #5972 from CHOMPStation2/upstream-merge-14707 
[MIRROR] Should fix props being un-var-editable
 2023-03-19 08:58:41 -04:00
Nadyr
2dda11b280 powder that makes you say yes 2023-03-19 08:56:21 -04:00
Nadyr
d26efab377 Merge pull request #5964 from Sharkmare/patch-20 
Adding an ID slot to the Communicator
 2023-03-19 08:40:37 -04:00
Casey
2e3d51e095 Merge pull request #14707 from Heroman3003/propvaredit 
Should fix props being un-var-editable
 2023-03-18 21:01:44 +00:00
Casey
884f772c49 Mob tweaks and fixes 2023-03-18 20:56:26 +00:00
Sharkmare
c42510c309 Adding an ID slot to the Communicator 
Allows you to slot your scanned ID into your communicator
 2023-03-17 23:15:56 +01:00