cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,635 Commits 7 Branches 0 Tags
d75c98d9b6eaec7956e403cf41e2c0035c3af4bc
Commit Graph

10299 Commits

Author SHA1 Message Date
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
ac1f228231 powder that makes you say yes 2022-08-01 22:11:09 -04:00
C.L
2e99cc8de8 Adds in a modified Replicator Transformation Device 2022-08-01 21:59:31 -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
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
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
a507a21424 powder that makes you say yes 2022-07-19 20:50:10 -04:00
Casey
4f4b6fdf9a Merge pull request #13351 from Heroman3003/dirtfix 
Makes persistant dirt not reset its alpha after some dirtying
 2022-07-17 09:33:51 +00:00
Casey
fa9dd3dc1b Adds double engi closets for SD and RP 2022-07-17 09:31:34 +00:00
Casey
69eba2c403 Buffs Blockers and alters the new sound toggle verbs again 2022-07-17 05:05:32 +00:00
Casey
ec15ef3b8d Merge pull request #13343 from Heroman3003/deco-axe 
Adds 'fireaxes' to atmos/emt bay on SD/RP
 2022-07-16 21:39:09 +00:00
Casey
8d83d4d3fd Adds roulette balls 2022-07-15 22:31:00 +00:00
Casey
2ad683220b Adds light and heavy frame traits 2022-07-15 22:30:56 +00:00
Nadyr
494be6adef Merge pull request #4541 from CHOMPStation2/upstream-merge-12911 
[MIRROR] Lucky 7 Casino and Restaurant
 2022-07-13 19:44:05 -04:00
Nadyr
047f5d60d2 powder that makes you say yes 2022-07-13 19:02:34 -04:00
Kassc
9d620f4096 Merge pull request #4329 from VictorZisthus/majormapedits 
Massive Broad Scope Changes
 2022-07-13 19:02:32 -04:00
Nadyr
f6ad66e76f powder that makes you say yes 2022-07-13 19:02:22 -04:00
Nadyr
01ea79d750 Merge pull request #4538 from CHOMPStation2/upstream-merge-13313 
[MIRROR] Guide to Robotics wiki-link fix
 2022-07-13 18:48:42 -04:00
Nadyr
b9a868b25a Merge pull request #4525 from CHOMPStation2/upstream-merge-13294 
[MIRROR] Mouse Ray
 2022-07-13 18:44:18 -04:00
Casey
dda05e9aa7 Lucky 7 Casino and Restaurant 2022-07-12 06:03:43 +00:00
Nadyr
44525f2e7c Merge branch 'master' into upstream-merge-13313 2022-07-11 21:45:29 -04:00
Nadyr
7af3a7f746 Merge pull request #4524 from CHOMPStation2/upstream-merge-13295 
[MIRROR] New book: Guide to Robotics
 2022-07-11 20:44:14 -04:00
Casey
2c4d18a678 Guide to Robotics wiki-link fix 2022-07-10 22:52:12 +00:00
Casey
26dce1db7b Mouse Ray 2022-07-08 00:32:36 +00:00
Casey
f67861210f New book: Guide to Robotics 2022-07-08 00:32:30 +00:00
Casey
27b89fc164 Merge pull request #13278 from Heroman3003/implanter-fix 
Fixes implanter implant teleportation
 2022-07-08 00:30:06 +00:00
Casey
d1863ff7ab Communicator Reply Messages 2022-07-03 21:29:21 -04:00
Razgriz
635eabfe48 Merge pull request #4481 from CHOMPStation2/upstream-merge-13249 
[MIRROR] Changes the site manager's sidearm from a singular option to a choice instead
 2022-07-03 17:13:52 -07:00
Razgriz
ffcab89eda Merge pull request #4479 from CHOMPStation2/upstream-merge-13243 
[MIRROR] Makes seismic charges not work on admin z-levels
 2022-07-03 17:11:56 -07:00
Razgriz
a1dd92ad43 Merge pull request #4475 from CHOMPStation2/upstream-merge-13235 
[MIRROR] Ports ability to make press camera drones
 2022-07-03 17:11:16 -07:00
Razgriz
1867ac6b87 Merge pull request #4465 from CHOMPStation2/upstream-merge-13227 
[MIRROR] Makes robot emergency restart re-add robot verbs
 2022-07-03 17:06:07 -07:00
Casey
7ac2d6537b Merge pull request #13249 from BonniePandora/petty-rage 
Changes the site manager's sidearm from a singular option to a choice instead
 2022-07-03 09:07:00 +00:00
Casey
3620af967b Merge pull request #13243 from Heroman3003/seismic-admin 
Makes seismic charges not work on admin z-levels
 2022-07-03 09:05:50 +00:00
Casey
3222c997a4 Merge pull request #13235 from Runa-Dacino/TVCamera_Port_synced 
Ports ability to make press camera drones
 2022-07-02 05:09:35 +00:00