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
50,870 Commits 10 Branches 0 Tags
979bd4891c4661960276444cccfa37df322563ea
Commit Graph

36515 Commits

Author SHA1 Message Date
RadiantFlash7
4bf53cacde Heckin, fixed my notations ;-; 
Rude host, making me be a proper coder and not suck.
 2019-12-14 23:54:05 -05:00
RadiantFlash7
b0365f35f5 Merge branch 'map' of https://github.com/RadiantFlash7/YWPolarisVore into map 2019-12-14 23:40:33 -05:00
RadiantFlash7
2216d15f6a deliniates changes of YW in non YW files 
Fixes some more map stuff.
 2019-12-14 23:40:22 -05:00
Repede
72d1cb1fc7 Merge branch 'master' into map 2019-12-14 23:11:14 -05:00
RadiantFlash7
3b5974d125 Release day fixes 
Release day fixes!
Event disables/added stuff,
Tons of map issues fixed.
 2019-12-14 23:09:31 -05:00
Repede
a11ecd4b16 Merge pull request #290 from RadiantFlash7/map 
Map fixes!
 2019-12-14 12:35:56 -05:00
RadiantFlash7
37140bbd6b Tore it out, just like my heart 
Removes all mutiny code and old anouncement code. To be fixed later and re-added. (Breaks travis due to color)
 2019-12-14 12:22:07 -05:00
RadiantFlash7
64e7b88c4a Adds airlocknotice 
Adds airlock notice, and last minute map touchups to make it feel like a recently purchased and rennovated station.
 2019-12-14 11:53:40 -05:00
RadiantFlash7
f86a104f40 Fixes telecoms 
Fixes telecoms, adds mutiny gamemode stuff, still needs fixes before it'll work.
Adds old anouncements file, but desk anouncements are not yet functioning. Disabled for now.
 2019-12-13 16:37:32 -05:00
Repede
78089f01ab Merge pull request #288 from RadiantFlash7/map 
Fixes wine vats and all errors from travis
 2019-12-12 18:51:52 -05:00
RadiantFlash7
c98003a013 Fixes wine vats and all errors from travis 
Fixes wine vats and all errors from travis
 2019-12-12 18:41:21 -05:00
Repede
5ff1ee9725 Unit test fixes 2019-12-11 19:15:40 -05:00
RadiantFlash7
ae3f109ae1 load order fix& typos. 
Fixes minor typos and load order for the job outfits datums.
 2019-12-09 18:56:10 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Repede
0159234240 Fixes outdoor platings 
Phororeagent fixes
 2019-12-09 12:04:41 -05:00
RadiantFlash7
2348fed664 More fixes. 
Fixes for the map.
Fixes turfs, cameras, access issues, and a few more things.
 2019-12-08 18:32:45 -05:00
RadiantFlash7
657b53cf8a Cameras+Airlock freq 
Experimentally adds a freq to airlock
And Adds a few missing cameras.
 2019-12-08 13:57:14 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
RadiantFlash7
3fc8f433bc Play Test fixes 
Fixes every single bug in the playtest so far.
 2019-12-08 11:33:54 -05:00
Repede
f9688aea70 Edgyness increase 2019-12-08 01:12:17 -05:00
Unknown
ea4c6075b7 Fixes busted syringes 2019-12-07 10:25:28 -05:00
Unknown
d92e151dab Fixes typo name 2019-12-06 19:32:35 -05:00
Unknown
f42cd78de3 Fixes Elven Weapons 2019-12-06 19:14:35 -05:00
Unknown
192dd12e7f Attempts to fix Gladius 2019-12-06 18:59:35 -05:00
Unknown
9435f5720d Misc Tweaks Pt. 2 
- Slightly increases Centcom/Modified translocator energy costs
 2019-12-06 18:44:16 -05:00
Unknown
d8392dfe8b More updates 2019-12-06 18:24:18 -05:00
Unknown
a3c48e6eca how did that get deleted 2019-12-06 17:18:05 -05:00
Unknown
062d8ec39c Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-12-06 17:10:23 -05:00
Unknown
5499e3272f Miscellaneous fixes 
- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds

Fixes #6265
 2019-12-06 17:10:13 -05:00
Repede
461fcfd160 Fixing medal fluff 2019-12-06 16:10:35 -05:00
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder 
Centcom/Tether Ship Changes
 2019-12-06 16:06:56 -05:00
Novacat
26b0f83192 Merge pull request #6241 from Heroman3003/black-eyed-fluffers 
New Species: Black-Eyed Shadekin
 2019-12-06 11:37:23 -05:00
Spades
7a77a3296d Merge pull request #6268 from Novacat/nova-branchfix 
Dragor Vendor Changes
 2019-12-06 10:55:28 -05:00
Spades
f977f0988c Merge pull request #6267 from Verkister/yehaw 
Some more simplemob QoL and fixes.
 2019-12-06 10:54:40 -05:00
Spades
485ca0534f Merge pull request #6243 from Mithrandalf/mouse 
I improved mice
 2019-12-06 10:51:36 -05:00
Novacat
ccae9c2a58 Merge pull request #6272 from VOREStation/upstream-merge-6557 
[MIRROR] Stops bots from opening elevator doors
 2019-12-05 22:43:32 -05:00
Novacat
8153e08484 Merge pull request #6270 from VOREStation/upstream-merge-6545 
[MIRROR] Adds Irrlicht's 'soft' shroud
 2019-12-05 19:11:03 -05:00
Novacat
a73726fd19 Update bot.dm 2019-12-05 19:10:29 -05:00
Heroman3003
00c1e44852 Stops bots from opening elevator doors 2019-12-05 18:30:20 -05:00
lolman360
e2b47484c8 Fixy-wixies the fucky-wucky I madey-wadey with toy swords. (#6526) 
* one

* rtwo

* image

* Update material_weapons.dm

* Update toys.dm

* Revert "Update material_weapons.dm"

This reverts commit 1a37bb015a5e503a4c5f0433bc279f15514319a7.

* Revert "image"

This reverts commit 6496dd404d0eb740e158fbc94322f6944f508886.

* Revert "rtwo"

This reverts commit 3b7aacd6c830e52986f2a34abf5b5ccbfbb135f8.

* Revert "one"

This reverts commit 324d188058c0a824c0259e2d6b98f69e563846bd.

* Update toys.dm
 2019-12-05 18:29:06 -05:00
listerla
086cfb579c Adds Irrlicht's 'soft' shroud (#6545) 
* Adds Irrlicht's soft Shroud

* fixes
 2019-12-05 18:28:53 -05:00
Repede
4c8c94559c Merge branch 'master' into master 2019-12-02 20:44:35 -05:00
Repede
1644d56079 Merge branch 'map' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-02 19:30:06 -05:00
Repede
b0c179b453 Readding planetary_yw.dm 2019-12-02 19:29:40 -05:00
Heroman3003
69ca6dc2f3 Gives crewkin less weakness to attacks, but weaker bones 2019-12-03 09:54:00 +10:00
Izac Joof Forsgren
b7b0412c85 Merge pull request #276 from Yawn-Wider/izac-map 
density to 0
 2019-12-03 00:39:52 +01:00
izac112
8e05979b7e density to 0 2019-12-03 00:37:52 +01:00
Izac Joof Forsgren
42396c30a7 Merge pull request #275 from Yawn-Wider/izac-map 
Proof of concept thermal regulator for the airlocks
 2019-12-02 23:43:45 +01:00
Repede
42496d4fb1 Map atmosphere fixes and cleanup of map defines and code for atmos stuff. 
Thanks Aronai.
 2019-12-02 17:30:40 -05:00
izac112
20f3a4b328 Proof of concept thermal regulator for the airlocks 2019-12-02 23:28:40 +01:00