cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,746 Commits 8 Branches 0 Tags
6724f6a6a2bb63df1edab73c8c5efb49dd69fcd0
Commit Graph

45319 Commits

Author SHA1 Message Date
Nadyr
e302d2828b Merge pull request #2675 from CHOMPStationBot/upstream-merge-11270 
[MIRROR] You can use health analyzers on simplemobs now
 2021-07-27 19:03:04 -04:00
Aronai Sieyes
b6ff4dd248 Merge pull request #11270 from Very-Soft/simplemobmedicalscans 
You can use health analyzers on simplemobs now
 2021-07-27 15:41:54 +00:00
Aronai Sieyes
908b64af01 Merge pull request #11273 from VOREStation/Arokha/gasvisuals 
Gas visuals use vis_contents not overlays
 2021-07-27 15:40:45 +00:00
Novacat
13fb556789 Merge pull request #11262 from VOREStation/Arokha/what 
What???
 2021-07-27 01:11:50 +00:00
Nadyr
94d93a5c0f Merge pull request #2665 from CHOMPStationBot/upstream-merge-11249 
[MIRROR] Observer darkness levels
 2021-07-26 19:50:44 -04:00
Nadyr
9cf1fa2a1f Merge pull request #2669 from CHOMPStationBot/upstream-merge-11259 
[MIRROR] AAAAAA
 2021-07-26 18:32:22 -04:00
Nadyr
c5a339b38b Merge pull request #2668 from CHOMPStationBot/upstream-merge-11257 
[MIRROR] Attempt to further fix missing languages
 2021-07-26 18:32:04 -04:00
Nadyr
14988545b5 Merge pull request #2667 from CHOMPStationBot/upstream-merge-11210 
[MIRROR] 7/22/2021 Food Revamp
 2021-07-26 18:31:47 -04:00
Nadyr
662b89d6c4 Merge pull request #2666 from CHOMPStationBot/upstream-merge-11255 
[MIRROR] Fixes photo code still using step_x/y
 2021-07-26 18:30:45 -04:00
Nadyr
ce471497f4 powder that makes you say yes 2021-07-26 18:29:50 -04:00
Nadyr
8979895cd2 Merge pull request #2662 from CHOMPStationBot/upstream-merge-11252 
[MIRROR] Adds *scary for synths
 2021-07-26 18:24:48 -04:00
Nadyr
263538e2e0 Merge pull request #2654 from Shadowfire117/casinomanualrework 
Less Ringa ding and work in progress new casino manual
 2021-07-26 18:24:24 -04:00
Aronai Sieyes
5d6d45904d Merge pull request #11259 from VOREStation/Arokha/dropfix 
AAAAAA
 2021-07-26 21:24:07 +00:00
Aronai Sieyes
ddbb24e271 Merge pull request #11257 from VOREStation/Arokha/sani 
Attempt to further fix missing languages
 2021-07-26 18:14:54 +00:00
Ghost Actual
50c2de86d2 7/22/2021 Food Revamp (#11210) 
* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Conflict Fix

* Oopsie

* Fixes known issues

* Uploads Files for Remote Work

* Small Fix

* Final Commit (hopefully)

* Small Fix
 2021-07-26 16:51:23 +00:00
Aronai Sieyes
7551fa2954 Merge pull request #11255 from Verkister/patch-75 
Fixes photo code still using step_x/y
 2021-07-26 13:32:57 +00:00
Chompstation Bot
7a1079dcca Observer darkness levels 2021-07-26 13:31:49 +00:00
Aronai Sieyes
7acce9cc33 Merge pull request #11252 from VOREStation/Arokha/synthscare 
Adds *scary for synths
 2021-07-26 13:31:27 +00:00
Nadyr
15fe33624a Merge pull request #2661 from CHOMPStationBot/upstream-merge-11247 
[MIRROR] Fixes missing pipe! And some floor decals
 2021-07-25 23:05:24 -04:00
Chompstation Bot
7bd460600c Fixes missing pipe! And some floor decals 2021-07-26 00:51:13 +00:00
Aronai Sieyes
22fc4fea91 Merge pull request #11246 from VOREStation/Arokha/betterpref 
The nightmare is over
 2021-07-26 00:51:06 +00:00
Chompstation Bot
6df9089784 Adds medical kiosk to code/buildable 2021-07-25 22:02:18 +00:00
Nadyr
8aee4bccb1 Merge pull request #2657 from CHOMPStationBot/upstream-merge-11235 
[MIRROR] Fixes #11223
 2021-07-25 18:01:38 -04:00
Nadyr
c3b1602406 Merge pull request #2656 from CHOMPStationBot/upstream-merge-11241 
[MIRROR] More TGMC Ports
 2021-07-25 18:01:16 -04:00
Aronai Sieyes
509586d6e9 Merge pull request #11235 from VOREStation/Fixes/11223 
Fixes #11223
 2021-07-25 21:46:57 +00:00
Chompstation Bot
f97dfc5dea More TGMC Ports 2021-07-25 21:45:48 +00:00
Aronai Sieyes
b5038715f8 Merge pull request #11242 from VOREStation/upstream-merge-8183 
[MIRROR] Fixes blank ID sprite for HoP/Secretary
 2021-07-25 18:17:32 +00:00
Shadowfire
94b8471cc0 Less Ringa ding and work in progress new casino manual 
Now people cant spam the slot machines and get platinum coins, they are once more special! Also new codex casino manual. Albeit still entries needs to be done at later moments but is being added for safety reasons and to access while I only have a laptop to work on.
 2021-07-25 17:45:47 +02:00
Nadyr
e3417eafde Merge pull request #2653 from CHOMPStationBot/upstream-merge-11239 
[MIRROR] [MIRROR] Chemsprayer Update
 2021-07-25 02:42:49 -04:00
Nadyr
03e7614962 Merge pull request #2650 from CHOMPStationBot/upstream-merge-11229 
[MIRROR] [MIRROR] Sign Oh Sure
 2021-07-25 02:42:24 -04:00
Nadyr
189669c6ef Merge pull request #2649 from CHOMPStationBot/upstream-merge-11230 
[MIRROR] Add tgmc doors as an option for angled airlocks
 2021-07-25 00:57:26 -04:00
Nadyr
74079df6e3 powder that makes you say yes 2021-07-25 00:45:22 -04:00
Nadyr
f561b836d2 powder that makes you say yes 2021-07-25 00:41:10 -04:00
Nadyr
871550539f Merge pull request #2648 from CHOMPStationBot/upstream-merge-11227 
[MIRROR] Improve admin spawn features
 2021-07-24 23:52:07 -04:00
Nadyr
ebf31e8d50 Merge pull request #2647 from CHOMPStationBot/upstream-merge-11224 
[MIRROR] Add recycling machinery
 2021-07-24 23:44:49 -04:00
Nadyr
19944c3ba0 Merge pull request #2645 from CHOMPStationBot/upstream-merge-11220 
[MIRROR] New Rack and Wardrobe
 2021-07-24 23:44:37 -04:00
Nadyr
f2d33d0aef Merge pull request #2644 from BlackMajor/patch-8 
Tiny ddos fix
 2021-07-24 21:28:23 -04:00
Chompstation Bot
84d54d6c4e [MIRROR] Chemsprayer Update 2021-07-25 00:27:57 +00:00
BlackMajor
03439f0c5e Update holder_micro_vr.dm 2021-07-25 12:24:19 +12:00
Nadyr
833a015ee3 Merge pull request #2646 from CHOMPStationBot/upstream-merge-11226 
[MIRROR] Remove the between() proc
 2021-07-24 17:37:43 -04:00
Nadyr
ea3e19ffb3 Merge pull request #2643 from Shadowfire117/sentientprizework 
Casino Sentient Prize Rework
 2021-07-24 17:34:22 -04:00
Chompstation Bot
3e3d82a363 [MIRROR] Sign Oh Sure 2021-07-24 18:12:50 +00:00
Chompstation Bot
fd4c50fbec Add tgmc doors as an option for angled airlocks 2021-07-24 18:12:44 +00:00
Chompstation Bot
8b01c674d0 Improve admin spawn features 2021-07-24 17:05:36 +00:00
Chompstation Bot
8818729b17 Add recycling machinery 2021-07-24 17:04:28 +00:00
Aronai Sieyes
fb491666a0 Merge pull request #11226 from VOREStation/Arokha/between 
Remove the between() proc
 2021-07-24 17:04:21 +00:00
Chompstation Bot
6280067d11 New Rack and Wardrobe 2021-07-24 16:42:54 +00:00
BlackMajor
b3f6ed084b Update holder_micro_vr.dm 2021-07-25 01:51:06 +12:00
Shadowfire
f4c8f0078e Sentient Prize rework 
Made an automated hub system called SPASM
People can volunteer and get chips and a personalized collar that shows their avaliability. Crew can at the hub see who has a collar and if they are available or if owned, by who. Crew can buy a sentient prize and the collar will remotely be updated to reflect owned status. Likewise the personalized prize can buy themself out of the system if they got the chips and aren't owned, else the owner can swipe their collar on the hub and release them. Casino management has full access and can delete entries as well and enable/disable the sales hub. 

And remember! Its not slavery which is illegal by the admirality law! Its just friendly and fun temporary indentured servitude!~
 2021-07-24 13:12:18 +02:00
Razgriz
21534eef24 space 2021-07-24 01:32:13 -07:00