cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-11 01:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,847 Commits 7 Branches 0 Tags
9029dfd48ddbe1b5c718bbde85f370484aa43ff4
Commit Graph

9386 Commits

Author SHA1 Message Date
Razgriz
e9cfca5370 Update misc_vr.dm 2021-03-31 02:18:45 -07:00
Razgriz
3cba6aaab2 Update intercom.dm 2021-03-30 17:40:07 -07:00
Nadyr
4307a692e8 Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032 
[MIRROR] Adminbus Area Modifications
 2021-03-30 04:00:25 -04:00
Nadyr
452671247c Update trash_pile_vr.dm 2021-03-30 02:54:11 -04:00
Nadyr
9e24887a57 Update weldbackpack_ch.dm 2021-03-30 01:33:29 -04:00
Nadyr
a777f6993d Merge branch 'master' into upstream-merge-10025 2021-03-30 00:58:05 -04:00
Chompstation Bot
337acaa851 Adminbus Area Modifications 2021-03-29 17:22:38 +00:00
Nadyr
c0fd1e030b Merge pull request #1693 from CHOMPStationBot/upstream-merge-10029 
[MIRROR] MORE ALT ID STUFF
 2021-03-28 22:19:31 -04:00
Nadyr
e9ff8803ae Update station_ids_vr.dm 2021-03-28 22:05:26 -04:00
Nadyr
81d55a1cb2 Merge pull request #1682 from MisterGrimm/Genaprawns 
Player Xenomorph Overhaul 1.1 , the Genaprawns
 2021-03-28 21:53:36 -04:00
Chompstation Bot
149f222644 MORE ALT ID STUFF 2021-03-28 23:59:28 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Nadyr
3c692ed159 Merge branch 'master' into upstream-merge-10018 2021-03-28 00:05:29 -04:00
Nadyr
9de40aacb1 Merge pull request #1667 from CHOMPStationBot/upstream-merge-10016 
[MIRROR] Adds alternative ID cards!
 2021-03-27 23:50:28 -04:00
Nadyr
f6049a256a Merge branch 'master' into upstream-merge-10007 2021-03-27 23:13:57 -04:00
Nadyr
ace9beb3d1 Delete id_stacks_deptname.dm 2021-03-27 22:59:17 -04:00
Nadyr
04f4302dfa Delete id_stacks_cit.dm 2021-03-27 22:58:50 -04:00
Nadyr
a8e03b8061 Merge branch 'master' into upstream-merge-10008 2021-03-27 22:31:57 -04:00
Nadyr
2133df1507 Merge branch 'master' into upstream-merge-10002 2021-03-27 22:03:57 -04:00
Nadyr
8c01fbb78d Merge pull request #1655 from CHOMPStationBot/upstream-merge-9989 
[MIRROR] [MIRROR] New ID Card Design
 2021-03-27 21:52:28 -04:00
Sym
8ca11f0439 Changing player Xenomorphs to Genaprawns 2021-03-26 19:42:08 -04:00
Nadyr
e98859942f Merge branch 'master' into upstream-merge-9974 2021-03-26 03:57:31 -04:00
Nadyr
4ce40dad53 Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 
[MIRROR] [MIRROR] Added think-tanks.
 2021-03-26 03:50:02 -04:00
Chompstation Bot
7524088a39 Removes redundant sprite_stack definitions from ID files 2021-03-25 18:36:40 +00:00
Novacat
2b00accc0b Merge pull request #10016 from Very-Soft/altids 
Adds alternative ID cards!
 2021-03-25 12:12:51 +00:00
Razgriz
13a9e0c94a Update event_vr.dm 2021-03-24 23:05:42 -07:00
Razgriz
5e18aaed38 Event update 
Fixes Gravity event. Also adds landmarks to the map that enables the maints pred event.
 2021-03-24 23:03:24 -07:00
Chompstation Bot
f825d5ca9f Fixes Fluff and ITG ID cards, refactors event/fluff IDs a lil', also fixes for digested id icons 2021-03-24 18:51:25 +00:00
Chompstation Bot
f249133c88 [MIRROR] Patches new ID card code 2021-03-24 18:17:46 +00:00
Chompstation Bot
320209f31e Fixes gold IDs somehow having forgotten the sprites 2021-03-23 21:13:23 +00:00
Chompstation Bot
abc800056c [MIRROR] New ID Card Design 2021-03-23 16:15:59 +00:00
Novacat
9c209652a9 Merge pull request #9988 from VOREStation/upstream-merge-7973 
[MIRROR] News Update  + Communicator Lag Fix
 2021-03-21 21:25:45 +00:00
Nadyr
de07a4e79d Merge branch 'master' into upstream-merge-9961 2021-03-21 04:34:39 -04:00
Nadyr
c8321a53df Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960 
[MIRROR] [MIRROR] Added Doctress' Jager drink.
 2021-03-21 04:31:54 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Razgriz
202651b317 Merge pull request #1629 from CHOMPStationBot/upstream-merge-9973 
[MIRROR] [MIRROR] Makes custom cigarettes even more custom-ier
 2021-03-19 22:44:13 -07:00
Chompstation Bot
2915e36ee8 [MIRROR] Tachikoma tweaks. 2021-03-19 09:44:42 +00:00
Novacat
a4bf657c59 Merge pull request #9973 from VOREStation/upstream-merge-7925 
[MIRROR] Makes custom cigarettes even more custom-ier
 2021-03-19 07:48:42 +00:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Novacat
46506f23de Merge pull request #9968 from VOREStation/upstream-merge-7980 
[MIRROR] GPS presentation/update tweaks/fixes.
 2021-03-18 14:40:23 +00:00
Chompstation Bot
07dcf04408 [MIRROR] Fixes Global and Fixes Eyes 2021-03-18 14:40:07 +00:00
Novacat
f2fc4c8be7 Merge pull request #9960 from VOREStation/upstream-merge-7974 
[MIRROR] Added Doctress' Jager drink.
 2021-03-18 14:40:00 +00:00
Razgriz
5c285eda7d Merge pull request #1595 from ZVB334/Weldpackfix 
Fixes Teshari Welderbackpack Sprite
 2021-03-17 03:33:50 -07:00
Razgriz
6e171d3182 Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 
[MIRROR] [MIRROR] Matter Matters
 2021-03-16 22:22:28 -07:00
ZVB334
4baf7186fd Fixes Teshari Welderbackpack Sprite 2021-03-12 11:20:26 -06:00
Nadyr
c6d02615d7 Merge pull request #1574 from CHOMPStationBot/upstream-merge-9913 
[MIRROR] Adds a new maint pred mob
 2021-03-12 01:48:23 -05:00
Nadyr
62e293b890 Merge pull request #1557 from CHOMPStationBot/upstream-merge-9894 
[MIRROR] [MIRROR] Adds an advanced version of the mining drill scanner.
 2021-03-12 00:05:38 -05:00
Novacat
9645893750 Merge pull request #9913 from Heroman3003/sect-drone 
Adds a new maint pred mob
 2021-03-11 14:48:27 +00:00
Nadyr
9be6ad7774 Merge pull request #1562 from CHOMPStationBot/upstream-merge-9897 
[MIRROR] [MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-11 00:52:13 -05:00
Novacat
4631c4faca Merge pull request #9897 from VOREStation/upstream-merge-7963 
[MIRROR] Tweaked implant loadout, refactored implant detection.
 2021-03-10 19:40:33 +00:00