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

6360 Commits

Author SHA1 Message Date
Victor Zisthus
d209cf735c Brass tools icon fix 
Title.

FIXES #4174
 2022-08-04 22:50:12 -04: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
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
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
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
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
Nadyr
a507a21424 powder that makes you say yes 2022-07-19 20:50:10 -04:00
Casey
fa9dd3dc1b Adds double engi closets for SD and RP 2022-07-17 09:31:34 +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
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
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
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
Novacat
28a212bfac Merge pull request #13227 from Heroman3003/robofix2 
Makes robot emergency restart re-add robot verbs
 2022-07-01 21:25:14 +00:00
Nadyr
e4266fbf08 Merge branch 'master' into upstream-merge-13199 2022-06-30 17:31:02 -04:00
Casey
e8b45184d2 A pAI death tweak I forgot! 2022-06-29 06:22:16 +00:00
Casey
285b424a75 Death of pAIs!!! 2022-06-29 05:58:53 +00:00
Nadyr
0c9b70b451 Merge pull request #4414 from CHOMPStation2/upstream-merge-13160 
[MIRROR] Account for Sleevecards and mild pAI use screen revamp
 2022-06-25 16:25:40 -04:00
Nadyr
aa0e710364 Merge pull request #4413 from CHOMPStation2/upstream-merge-13159 
[MIRROR] Fixes issues with taurs and belts/suits. Again.
 2022-06-25 16:23:19 -04:00
Nadyr
1080181d6b Merge pull request #4415 from CHOMPStation2/upstream-merge-13161 
[MIRROR] Fixes selectable item dupe bug
 2022-06-25 16:03:44 -04:00
Casey
2e7abb6af1 Merge pull request #13161 from Heroman3003/dupefix1 
Fixes selectable item dupe bug
 2022-06-25 07:12:05 +00:00
Casey
d607a8a3c5 Merge pull request #13160 from Very-Soft/accountforsleevecards 
Account for Sleevecards and mild pAI use screen revamp
 2022-06-25 02:31:55 +00:00
Casey
8dd5039119 Fixes issues with taurs and belts/suits. Again. 2022-06-25 02:23:35 +00:00
Casey
82ba349c54 Merge pull request #13152 from TankTheBirb/holster-pais 
pAIs can now be holstered!
 2022-06-24 00:02:04 +00:00
Nadyr
9764d2aae1 Merge pull request #4407 from CHOMPStation2/upstream-merge-13150 
[MIRROR] Fixes more runtimes
 2022-06-23 17:50:49 -04:00
Casey
79f5dc9c3f Merge pull request #13150 from Heroman3003/runtime-2 
Fixes more runtimes
 2022-06-23 10:43:41 +00:00
Casey
68c3469d60 ALL runtimes 2022-06-23 09:41:56 +00:00
Nadyr
7f9bb6e91d powder that makes you say yes 2022-06-23 00:01:53 -04:00
Nadyr
0d15d88972 powder that makes you say yes 2022-06-23 00:01:30 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
b4c293749b Merge pull request #4399 from CHOMPStation2/upstream-merge-13136 
[MIRROR] pAI QOL
 2022-06-22 23:24:47 -04:00