cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-29 18:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,892 Commits 13 Branches 0 Tags
3d53d2bb62dfa1b84860ae7121b69eb45d0db8ea
Commit Graph

6555 Commits

Author SHA1 Message Date
Heroman3003
3d53d2bb62 Little Weakref Refactor 2023-06-03 09:22:18 +00:00
Heroman3003
efeace49d3 Merge pull request #14911 from Runa-Dacino/PicnicBlanket 
Adds a new object: Picnic blankets! They can be folded & unfolded
 2023-05-31 00:40:45 +00:00
Nadyr
e1b4177afd Merge pull request #6260 from CHOMPStation2/upstream-merge-14904 
[MIRROR] Better Bags
 2023-05-29 19:22:52 -04:00
Nadyr
7424e1de6e powder that makes you say yes 2023-05-29 19:04:23 -04:00
Nadyr
92dce0ceb5 Merge pull request #6253 from CHOMPStation2/upstream-merge-14900 
[MIRROR] Better Candy Bars
 2023-05-29 18:55:14 -04:00
Nadyr
33f456ba40 Merge pull request #6250 from CHOMPStation2/upstream-merge-14897 
[MIRROR] Fixes #14896
 2023-05-29 18:50:54 -04:00
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
Heroman3003
b935061a1c Better Bags 2023-05-28 02:59:23 +00:00
Heroman3003
fafbe1aed0 Merge pull request #14900 from Youtubeboy139/better_candy_bars 
Better Candy Bars
 2023-05-27 05:21:20 +00:00
Heroman3003
6a06a3836f Merge pull request #14897 from Youtubeboy139/fixes_egg 
Fixes #14896
 2023-05-26 20:56:39 +00: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
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
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
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
Sharkmare
91e0850f41 Makes contractor IDs suffix "contractor" 
Makes contractor IDs suffix "contractor" after the title name
 2023-04-06 23:13:11 +02: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
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
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
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
Nadyr
c74dd3431a Merge pull request #5958 from Sharkmare/patch-19 
Jar + Small people
 2023-03-17 04:02:25 -04:00
Nadyr
0fc70ed7d1 Merge pull request #5928 from CHOMPStation2/upstream-merge-14684 
[MIRROR] [MIRROR] Fixes a raunchy typo
 2023-03-17 03:25:05 -04:00
Nadyr
d26d90028d Merge pull request #5934 from CHOMPStation2/upstream-merge-14662 
[MIRROR] Weapon Info on Examine
 2023-03-17 03:19:20 -04:00
Nadyr
7a0786754b Merge branch 'master' into upstream-merge-14684 2023-03-17 03:10:41 -04:00
Nadyr
506661f8f4 Merge pull request #5919 from CHOMPStation2/upstream-merge-14551 
[MIRROR] [MIRROR] /tg/ era language pass
 2023-03-17 02:40:16 -04:00
Sharkmare
3231d8c9fc fixed? 2023-03-16 14:03:17 +01:00
Sharkmare
eaca1b5455 Jar + Small people 
Do i need to explain further?
 2023-03-16 13:55:12 +01:00
Heroman3003
5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-14 18:44:19 +00:00
Heroman3003
23df1fdc43 [MIRROR] Fixes a raunchy typo 2023-03-14 08:09:21 +00:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Novacat
230498d990 Merge pull request #14659 from Heroman3003/mre-and-int 
Two fix
 2023-03-12 04:33:32 +00:00
Nadyr
8e87297f90 Merge pull request #5883 from CHOMPStation2/upstream-merge-14583 
[MIRROR] more fixed admin hrefs
 2023-03-09 21:23:50 -05:00