cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,761 Commits 7 Branches 0 Tags
f0b51aba36717e7db2b0e1d1a0d5b2d956837ca0
Commit Graph

20109 Commits

Author SHA1 Message Date
Nadyr
4209a92290 Merge pull request #4703 from CHOMPStation2/upstream-merge-13494 
[MIRROR] Fixes secure briefcase AltClick
 2022-08-14 17:44:49 -04:00
Nadyr
6ca4bb352d Merge pull request #4702 from CHOMPStation2/upstream-merge-13493 
[MIRROR] Fixes recharge station overlays
 2022-08-14 17:44:23 -04:00
Nadyr
dc1701ae71 Merge pull request #4692 from CHOMPStation2/upstream-merge-13476 
[MIRROR] LEMME SUCC
 2022-08-14 17:30:44 -04:00
Nadyr
aa27319d18 Merge pull request #4691 from CHOMPStation2/upstream-merge-13468 
[MIRROR] [MIRROR] Removes eject from the mecha radial.
 2022-08-14 17:29:39 -04:00
Nadyr
0cce4310e4 Merge pull request #4690 from CHOMPStation2/upstream-merge-13469 
[MIRROR] Makes you able to select the borg plushies
 2022-08-14 17:28:52 -04:00
Nadyr
8f10ac1c1a Merge pull request #4684 from CHOMPStation2/upstream-merge-13442 
[MIRROR] [READY] Adds Altevian species
 2022-08-14 17:18:49 -04:00
Casey
4a0fa06764 Merge pull request #13494 from ItsSelis/secure-briefcase-fix 
Fixes secure briefcase AltClick
 2022-08-14 19:12:29 +00:00
Casey
cffa2804be Merge pull request #13493 from ItsSelis/recharge-station-fix 
Fixes recharge station overlays
 2022-08-14 19:11:22 +00:00
Casey
73eafa0b85 Merge pull request #13476 from TankTheBirb/Borg-SUCC 
LEMME SUCC
 2022-08-14 05:40:12 +00:00
Casey
aedd73d1a7 Merge pull request #13468 from VOREStation/upstream-merge-8675 
[MIRROR] Removes eject from the mecha radial.
 2022-08-14 05:39:06 +00:00
Casey
59ea1de538 Merge pull request #13469 from Cameron653/plushie 
Makes you able to select the borg plushies
 2022-08-14 05:39:01 +00:00
Victor Zisthus
6acf747711 Mutes some adminlog spam 
Title.

We don't want to get pinged with every spell cast, or notified everytime a dogborg vores someone.
 2022-08-12 21:39:10 -04:00
Casey
56b51e8ef2 [READY] Adds Altevian species 2022-08-12 18:05:36 +00:00
Novacat
52f9cb6350 Merge pull request #13474 from Heroman3003/washing-optimize 
Optimizes shower's turf washing a bit
 2022-08-11 00:08:31 +00:00
Nadyr
39f07b47a0 powder that makes you say yes 2022-08-07 18:38:15 -04:00
Casey
f384de2a1f Expands mining&archeology belt storage. 2022-08-07 19:46:45 +00:00
Victor Zisthus
d209cf735c Brass tools icon fix 
Title.

FIXES #4174
 2022-08-04 22:50:12 -04:00
Razgriz
77d181d3f2 Merge pull request #4649 from xnqm8h/Pouches 
Updates the ammo pouch to allow more device cell types.
 2022-08-04 18:25:32 -07:00
Novacat
a421234640 Merge pull request #13438 from Cameron653/RUNTIME_HOTFIX 
Hotfix to make items not shoot out runtimes.
 2022-08-04 00:25:52 +00:00
xnqm8h
a5fef3cfbf Update pouches.dm 2022-08-03 20:04:56 -04:00
Nadyr
5d2105ea36 Merge pull request #4637 from CHOMPStation2/upstream-merge-13423 
[MIRROR] get_random_colour() now prepends a #
 2022-08-01 22:32:12 -04:00
Nadyr
6fa8509ad0 Merge pull request #4635 from CHOMPStation2/upstream-merge-13382 
[MIRROR] Adds in a modified Replicator Transformation Device
 2022-08-01 22:24:28 -04:00
Nadyr
ac1f228231 powder that makes you say yes 2022-08-01 22:11:09 -04:00
Nadyr
63de704707 Merge pull request #4632 from CHOMPStation2/upstream-merge-13405 
[MIRROR] Engineering & Medical Contractor alt-titles
 2022-08-01 22:02:00 -04:00
C.L
2e99cc8de8 Adds in a modified Replicator Transformation Device 2022-08-01 21:59:31 -04:00
Nadyr
42b0ec8b0e powder that makes you say yes 2022-08-01 21:41:29 -04:00
Nadyr
324430b94d powder that makes you say yes 2022-08-01 21:37:17 -04:00
Nadyr
1abb07e90a Merge pull request #4622 from CHOMPStation2/upstream-merge-13392 
[MIRROR] Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs
 2022-08-01 20:58:15 -04:00
Nadyr
fe0cdde265 powder that makes you say yes 2022-08-01 20:40:27 -04:00
Poojawa
575a719688 get_random_colour() now prepends a # 2022-07-31 18:10:04 +00:00
Casey
e7846ee0c4 Engineering & Medical Contractor alt-titles 2022-07-31 09:23:58 +00:00
Casey
27753978fb Merge pull request #13397 from Fracshun/master 
Trash pile thing attempt 2
 2022-07-31 09:21:33 +00:00
Casey
ac204e7749 Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs 2022-07-29 20:48:29 +00:00
Nadyr
c5a0f8fb24 Merge pull request #4584 from CHOMPStation2/upstream-merge-13371 
[MIRROR] Fixes in-chat icons being broken in oldchat
 2022-07-20 21:12:22 -04:00
Nadyr
d96777a733 Merge pull request #4583 from CHOMPStation2/upstream-merge-13372 
[MIRROR] makes brainzsnax obtainable ingame
 2022-07-20 21:09:50 -04:00
Nadyr
7c6139b62f Merge branch 'master' into upstream-merge-13368 2022-07-20 20:41:14 -04:00
Nadyr
9d5dc5e62f Merge pull request #4566 from CHOMPStation2/upstream-merge-13346 
[MIRROR] Adds double engi closets for SD and RP
 2022-07-20 20:35:49 -04:00
Nadyr
1bc55469b9 Merge pull request #4564 from CHOMPStation2/upstream-merge-13352 
[MIRROR] Buffs Blockers and alters the new sound toggle verbs again
 2022-07-20 20:34:48 -04:00
Nadyr
27cbd920aa Merge pull request #4569 from CHOMPStation2/upstream-merge-13351 
[MIRROR] Makes persistant dirt not reset its alpha after some dirtying
 2022-07-20 20:20:28 -04:00
Nadyr
094984f9be Merge branch 'master' into upstream-merge-13352 2022-07-20 20:16:05 -04:00
Nadyr
4d358339ae Merge pull request #4562 from CHOMPStation2/upstream-merge-13343 
[MIRROR] Adds 'fireaxes' to atmos/emt bay on SD/RP
 2022-07-20 20:12:49 -04:00
Nadyr
b1c904123f Merge pull request #4548 from CHOMPStation2/upstream-merge-13321 
[MIRROR] Adds light and heavy frame traits
 2022-07-20 19:50:29 -04:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
95ad982fb2 Merge pull request #13372 from Screemonster/braaaaiiiins 
makes brainzsnax obtainable ingame
 2022-07-20 17:24:22 +00:00
Nadyr
259d1fd47d Merge pull request #4549 from CHOMPStation2/upstream-merge-13319 
[MIRROR] Adds roulette balls
 2022-07-19 20:55:00 -04:00
Nadyr
46be321937 Merge branch 'master' into upstream-merge-13321 2022-07-19 20:53:26 -04:00
Nadyr
a507a21424 powder that makes you say yes 2022-07-19 20:50:10 -04:00
Nadyr
ce8deeea01 Merge pull request #4555 from CHOMPStation2/upstream-merge-13332 
[MIRROR] Separates Forbids Events from Forbids Singulo
 2022-07-19 20:46:02 -04:00
Nadyr
d0f2748696 Merge pull request #4444 from CHOMPStation2/upstream-merge-13193 
[MIRROR] Implements all-species positive and negative traits
 2022-07-19 20:31:32 -04:00
Nadyr
0c25960270 Merge pull request #4531 from CHOMPStation2/upstream-merge-13277 
[MIRROR] Adds new alt titles for some jobs
 2022-07-19 20:23:25 -04:00