cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,715 Commits 10 Branches 0 Tags
2cfaf95e786407b131c46f8e83b70e7eff79aebb
Commit Graph

33780 Commits

Author SHA1 Message Date
Hawk_v3
2cfaf95e78 Merge branch 'upMaster' into updates 2018-10-21 03:48:41 +01:00
Aronai Sieyes
86cf5cfca7 Merge pull request #4431 from VOREStation/upstream-merge-5675 
[MIRROR] Ports Vote to SMC
 2018-10-20 17:58:12 -04:00
Spades
50825403df Merge pull request #4317 from lbnesquik/Kates-stethoscope-Feature 
Stethoscope vore shitpost
 2018-10-20 17:39:55 -04:00
Aronai Sieyes
d6cdba16c8 Merge pull request #4432 from VOREStation/upstream-merge-5685 
[MIRROR] Fix for Viewing Newly Made Records
 2018-10-20 17:37:34 -04:00
Aronai Sieyes
2d6d05acb0 Merge pull request #4429 from VOREStation/upstream-merge-5663 
[MIRROR] More paths to Quick_Create
 2018-10-20 17:37:20 -04:00
Arokha Sieyes
30a8a3ce31 VS edit merges 2018-10-20 17:37:08 -04:00
Spades
b28213c906 Merge pull request #4356 from Novacat/nova-ert 
ERT Equipment Redo
 2018-10-20 17:34:41 -04:00
Aronai Sieyes
382c6b5152 VS edit merge 2018-10-20 17:28:24 -04:00
Spades
dbec51db41 Merge pull request #4433 from Verkister/infixfix 
Fixes examine for mobs that relied on atom proc specific features.
 2018-10-20 08:58:05 -04:00
Spades
79d5ece0b3 Merge pull request #4430 from VOREStation/upstream-merge-5690 
[MIRROR] Fix wax appearing to be steel.
 2018-10-20 08:57:38 -04:00
Spades
87210df046 Merge pull request #4428 from VOREStation/upstream-merge-5667 
[MIRROR] Bring back the traitor panel verb.
 2018-10-20 08:56:39 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor 
Replaces awoo with wolfgirl
 2018-10-20 08:56:14 -04:00
Spades
6d3b8812f5 Merge pull request #4344 from Novacat/nova-heterochromia 
Reverts species settings
 2018-10-20 08:52:05 -04:00
Verkister
81fa928d4c Fixes examine for mobs that relied on atom proc features. 
-Mainly affected borgs and pAIs. Maybe others idk.
 2018-10-20 14:47:39 +03:00
Neerti
e019d0c8ef Fixes new record bug. (#5685) 2018-10-20 03:36:16 -04:00
Neerti
3a9c13b937 Ports Vote to SMC 2018-10-20 01:53:13 -04:00
Neerti
ea6a9f2df5 Merge pull request #5690 from lbnesquik/Kates-Wax-Fix 
Fix wax appearing to be steel.
 2018-10-20 00:07:01 -04:00
Neerti
360103a487 More paths to Quick_Create 2018-10-20 00:05:48 -04:00
Neerti
e46506adf7 Merge pull request #5667 from lbnesquik/Kates-Admin-Tweak² 
Bring back the traitor panel verb.
 2018-10-20 00:05:37 -04:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Sebbe9123
df23ae9891 Adds toggle for secpatch 
You can now toggle and switch what eye the secpatch covers for all your partial blindness needs.
 2018-10-18 11:27:04 +02:00
Hawk_v3
cdd64f9c42 Merge remote-tracking branch 'upstream/master' 2018-10-17 22:46:18 +01:00
Hawk_v3
d2476e5043 Fixes to minor things around the station, also: 
* Piano outside the bridge.
* RUST and Tesla engines should be more functional. Lightning rods for Tesla, RUST cooling control should now link to the vents and injectors correctly.
* Cargo Sealed Airlock now has access and control setup, should work when the rest of the fixes are made.
* All arrivals points now have emergency wall lockers with crowbars in.
 2018-10-17 22:46:09 +01:00
Spades
ea12d3d18c Merge pull request #4328 from lbnesquik/Kates-Citborg-Port 
Dogborgs start with full water reserves.
 2018-10-17 17:28:51 -04:00
Hawk_v3
83446f6fdf Merge remote-tracking branch 'upstream/master' 2018-10-17 05:27:00 +01:00
Hawk-v3
befbbf1f63 Merge branch 'master' into Languages 2018-10-17 04:05:44 +01:00
Repede
f7a1de120a Readds DMAPI for adminhelp tickets 2018-10-16 21:21:58 -04:00
Neerti
972777fd94 Adds Mods/Dev perms to ticket permission checks (#5683) 2018-10-16 18:28:14 -04:00
Hawk_v3
04d6cd31d6 Revert "Remove Language Fixes by Dwaggy" 
This reverts commit a2e1c4f0da.
 2018-10-16 22:48:08 +01:00
Hawk_v3
a2e1c4f0da Remove Language Fixes by Dwaggy 
See PR upcoming
 2018-10-16 22:47:30 +01:00
Hawk-v3
1adf494b74 Merge pull request #1 from Dwaggy/master 
Change Merges
 2018-10-16 22:43:10 +01:00
Hawk_v3
31e6df8e32 Fixes a typo and corrects a map section 
When you rename a suit_cycler from explorer to exploration don't rename the init so that it's for the "exploreration" cycler.
 2018-10-16 22:23:44 +01:00
Hawk_v3
71b8f6582d Merge remote-tracking branch 'upstream/master' 2018-10-16 22:10:17 +01:00
Aronai Sieyes
92209a64f7 Merge pull request #4408 from VOREStation/upstream-merge-5679 
[MIRROR] Makes RCDs Clean Again
 2018-10-16 14:50:40 -04:00
Aronai Sieyes
07377724e2 VS Changes to unsimulated.dm 2018-10-16 14:42:54 -04:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Anewbe
9007553a6c Merge pull request #5678 from Neerti/anchored_fix 
Fixes two anchored-related bugs, taped papers and the medbay phone.
 2018-10-16 14:05:10 -04:00
Unknown
d91b8af845 Requested Changes 3 2018-10-16 14:04:05 -04:00
Dwaggy
ffb495a58c Language fix for Akula and Zorren. 
-Hopefully this should fix Akula and Zorrens not been able to speak their own languages. Skrell and Terminus.

-'fixed' the musical instruments only limited to 50. changing all instruments to handle at 400..
 - I would have used the var, but..it didn't cooperate with me, i'm probably been really dumb with it, so did it this way instead, instruments are basiclly all spawned in anyway via admin right now.
 - (if someone wants to tell me how to make it work with the var, i'll do that, but the ways i tried, either errored or the game just ignored. so..*eh?*)
 2018-10-16 18:12:37 +01:00
Aronai Sieyes
8c764d487d Merge pull request #4340 from Novacat/nova-pathfinder 
Exploration Fixes for 09-27-2018 Sync
 2018-10-16 12:27:52 -04:00
Aronai Sieyes
c7d9ea6844 Merge pull request #4387 from deathride58/dontforgettosanitizeuserinput 
Fixes apostrophes in names causing javascript errors in the character directory
 2018-10-16 12:27:05 -04:00
Aronai Sieyes
ce0450e218 Merge pull request #4399 from VOREStation/upstream-merge-5666 
[MIRROR] Magazines improvements
 2018-10-16 12:19:06 -04:00
Aronai Sieyes
3b2d47087f Merge pull request #4397 from VOREStation/upstream-merge-5671 
[MIRROR] Prevent people from removing papers from any distances.
 2018-10-16 12:18:55 -04:00
Aronai Sieyes
872eff5004 Merge pull request #4395 from VOREStation/upstream-merge-5670 
[MIRROR] Fix a couple of ticket bugs
 2018-10-16 12:18:46 -04:00
Aronai Sieyes
d66c8e326b Merge pull request #4394 from VOREStation/upstream-merge-5652 
[MIRROR] Fixes missing sprites when excavating rocks
 2018-10-16 12:18:35 -04:00
Aronai Sieyes
fac9a2c121 Merge pull request #4393 from VOREStation/upstream-merge-5647 
[MIRROR] Add a noise for mining scanners.
 2018-10-16 12:18:14 -04:00
Aronai Sieyes
78bd63d568 Merge pull request #4392 from VOREStation/upstream-merge-5626 
[MIRROR] Move almost everything food related into the kitchen module.
 2018-10-16 12:18:05 -04:00
Aronai Sieyes
9dc2f288a0 Clean up two-way merge 2018-10-16 12:08:31 -04:00
Arokha Sieyes
ce187f64ed Fixup other vorestation things 
Stop using the web editor please
 2018-10-16 12:05:32 -04:00
Hawk_v3
cf91915e46 Merge remote-tracking branch 'upstream/master' 2018-10-16 00:25:28 +01:00