cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,047 Commits 7 Branches 0 Tags
ecf834c452ae2bf93b51e1ad9e42a69448308e0c
Commit Graph

2603 Commits

Author SHA1 Message Date
Nadyr
e15e92c2c5 Merge pull request #2329 from CHOMPStation2/Razgriz1032-patch-7 
Give medical doctors on spawn an advanced medkit instead of regular
 2021-07-03 20:45:08 -04:00
Chompstation Bot
e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz
385a6b8546 Port a fix from #2316 2021-07-03 00:38:05 -07:00
Razgriz
e3a9cd3775 Merge branch 'master' into upstream-merge-10764 2021-07-03 00:26:13 -07:00
Razgriz
ffe017bf01 Give medical doctors on spawn an advanced medkit instead of regular 2021-07-03 00:19:51 -07:00
Nadyr
e18d99d3e1 Merge pull request #2311 from CHOMPStationBot/upstream-merge-10752 
[MIRROR] The One Where You Can Aim Lights
 2021-07-01 21:30:46 -04:00
Chompstation Bot
bf04ca9003 Port /tg/ vis_contents openspace 2021-06-30 19:49:25 +00:00
Chompstation Bot
15fd9df408 The One Where You Can Aim Lights 2021-06-30 19:29:41 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Nadyr
030baa7ac8 powder that makes you say yes 2021-06-20 20:47:59 -04:00
Razgriz
b287747d4e Merge branch 'master' into upstream-merge-10683 2021-06-20 17:17:44 -07:00
Nadyr
937fafb5f5 Merge pull request #2245 from CHOMPStationBot/upstream-merge-10708 
[MIRROR] Phaser handbow crate name change
 2021-06-19 22:24:31 -04:00
Nadyr
c510fb5432 Merge pull request #2240 from CHOMPStationBot/upstream-merge-10686 
[MIRROR] [MIRROR] Removes Global Iterators
 2021-06-19 22:23:45 -04:00
Nadyr
a02607fe5a Merge branch 'master' into upstream-merge-10708 2021-06-19 22:03:34 -04:00
Nadyr
f0c2544f17 Merge pull request #2231 from CHOMPStationBot/upstream-merge-10652 
[MIRROR] Porting Over De-Husking Surgery
 2021-06-19 21:58:37 -04:00
Nadyr
e6034c46b1 Merge pull request #2224 from CHOMPStationBot/upstream-merge-10677 
[MIRROR] Fix compiler warning from unused var.
 2021-06-19 21:45:33 -04:00
Nadyr
0d1fcfd35e powder that makes you say yes 2021-06-19 21:35:29 -04:00
Nadyr
678de50987 Merge pull request #2211 from CHOMPStationBot/upstream-merge-10657 
[MIRROR] adds the phaser handbow
 2021-06-19 21:20:22 -04:00
Chompstation Bot
d582dd49aa Phaser handbow crate name change 2021-06-20 00:46:12 +00:00
Chompstation Bot
42cdb33edb [MIRROR] Removes Global Iterators 2021-06-19 13:43:53 +00:00
Razgriz
ffd82c6d5e Merge branch 'master' into upstream-merge-10683 2021-06-18 19:31:31 -07:00
Razgriz
540d32375d Merge pull request #2220 from CHOMPStationBot/upstream-merge-10662 
[MIRROR] Port current /tg/ lighting system
 2021-06-18 18:43:24 -07:00
Chompstation Bot
4b89d37b6d Porting Over De-Husking Surgery 2021-06-18 21:07:55 +00:00
Chompstation Bot
b69e24086a 6 fixes 2021-06-18 18:02:23 +00:00
Aronai Sieyes
0a6997151e Merge pull request #10677 from VOREStation/vplk-warning-fix 
Fix compiler warning from unused var.
 2021-06-18 15:54:42 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
55fffc549a Merge pull request #10669 from VOREStation/vplk-some-vv-bitfields 
Configure some VV bitfields and fix editor
 2021-06-18 04:17:48 +00:00
Novacat
fafe1bc65c Merge pull request #10657 from TheDavestDave/phaser-handbow 
adds the phaser handbow
 2021-06-17 19:50:01 +00:00
Novacat
21dc916a5b Merge pull request #10644 from VOREStation/upstream-merge-8129 
[MIRROR] leg holsters in cargo crate
 2021-06-14 11:55:39 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04:00
Nadyr
bf5a11da8d Merge branch 'master' into upstream-merge-10578 2021-06-07 19:20:23 -04:00
Chompstation Bot
a6ce064280 Put the music speakers in crates! 2021-06-07 04:49:25 +00:00
Chompstation Bot
190a2c3bb3 Portable music player, remote jukebox speaker 2021-06-06 05:25:40 +00:00
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518 
[MIRROR] Ports musical instruments from /tg/
 2021-06-02 02:54:38 -04:00
Nadyr
cbd3444841 powder that makes you say yes 2021-06-02 00:29:02 -04:00
Nadyr
c2d2402c69 Merge pull request #2108 from CHOMPStationBot/upstream-merge-10523 
[MIRROR] Runechat: Everything not a mob is an obj
 2021-06-01 23:23:20 -04:00
Aronai Sieyes
48c2db5984 Merge pull request #10523 from VOREStation/Arokha/runeturf 
Runechat: Everything not a mob is an obj
 2021-06-01 20:30:00 +00:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master 
explo vender stuff
 2021-06-01 14:58:32 +00:00
Nadyr
b0ea08e09b Merge pull request #2103 from CHOMPStationBot/upstream-merge-10515 
[MIRROR] Runechat tweak/feature
 2021-05-31 22:26:15 -04:00
Aronai Sieyes
715a37a0f2 Merge pull request #10515 from VOREStation/Arokha/another 
Runechat tweak/feature
 2021-05-31 19:36:29 +00:00
Aronai Sieyes
97cbe00e53 Merge pull request #10509 from VOREStation/Arokha/runebold 
Enable encoding chat emphasis in runechat
 2021-05-31 17:27:01 +00:00
Nadyr
51b6b3a096 Merge branch 'master' into upstream-merge-10504 2021-05-31 03:27:44 -04:00
Nadyr
e26aed009a Merge pull request #2095 from CHOMPStationBot/upstream-merge-10502 
[MIRROR] Fix chat message on different size mobs
 2021-05-31 03:26:04 -04:00
Nadyr
2c15103f44 Merge pull request #2096 from CHOMPStationBot/upstream-merge-10505 
[MIRROR] Some misc runtime fixes
 2021-05-31 03:17:57 -04:00