cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-22 23:33:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,578 Commits 9 Branches 0 Tags
34e44f0c7e4028ea7964ffe285fd641e8fac4bfe
Commit Graph

10630 Commits

Author SHA1 Message Date
Heroman3003
34e44f0c7e Merge pull request #14828 from ReoDaProtovali/AgentCardFeedback 
Agent ID Feedback
 2023-05-01 01:29:11 +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
Heroman3003
d2543ddf47 Merge pull request #14678 from KillianKirilenko/kk-talontweaks 
Frozen Organ Crates
 2023-03-17 21:05:28 +00:00
Nadyr
25ef364bd2 Merge pull request #5960 from CHOMPStation2/upstream-merge-14701 
[MIRROR] Shuttle Bay signs
 2023-03-17 04:03:28 -04: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
bd908dac14 Merge pull request #5927 from CHOMPStation2/upstream-merge-14681 
[MIRROR] [MIRROR] Sheet storage has different caps per type.
 2023-03-17 03:09:26 -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
Nadyr
d6bc869634 Merge pull request #5897 from CHOMPStation2/upstream-merge-14649 
[MIRROR] cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else
 2023-03-17 01:52:29 -04:00
Nadyr
fdc9c63123 Merge pull request #5905 from TheGreatKitsune/morgue-fix 
Fixes crematoriums sometimes getting broken when opening
 2023-03-17 01:49:03 -04:00
Heroman3003
b333971955 Shuttle Bay signs 2023-03-17 01:06:16 +00: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
18002a78a1 Merge pull request #14681 from VOREStation/upstream-merge-9029 
[MIRROR] Sheet storage has different caps per type.
 2023-03-14 08:08:13 +00:00