cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,305 Commits 8 Branches 0 Tags
3e1d73bbf1138f28bef82d034017e16133ce4938
Commit Graph

28078 Commits

Author SHA1 Message Date
Hawk_v3
3e1d73bbf1 Chaplain PDA Bug Fix & Atmos Dedupe 
- Chaplain PDA bug: Caused by the chaplain custom preview calling equip. Disabling it seems to have no issues with the preview and stops it making a new PDA every time it generates a new preview.

- Atmos Tech Dedupe: All engineers start with a T-Ray in their right pocket. Atmos techs also had one in their toolbelts. And now the extra one in the toolbelts is gone.
 2018-07-02 17:33:34 +01:00
Atermonera
d7ba0d8188 Merge pull request #5380 from Anewbe/hopefully_invincible_walls 
Dungeon walls no longer take damage.
 2018-07-01 14:56:49 -07:00
Atermonera
74cb7f8f4a Merge pull request #5379 from Anewbe/drowsy 
Fixes an infinite drowsyness bug
 2018-07-01 14:56:31 -07:00
Atermonera
141eebc875 Merge pull request #5378 from Anewbe/camera_thieves_reeeeeeeeeeee 
Apportation checks range again
 2018-06-30 15:46:18 -07:00
Atermonera
5064bb2f23 Merge pull request #5377 from Anewbe/taj_sign_tweaks 
Renames Taj Sign Language
 2018-06-30 15:45:40 -07:00
Anewbe
a326d232f2 Dungeon walls no longer take damage. 2018-06-30 15:36:48 -05:00
Anewbe
6bf2724ceb Fixes an infinite drowsyness bug 2018-06-29 17:43:11 -05:00
Anewbe
7e61fe00a5 Apportation checks range again 2018-06-29 17:29:39 -05:00
Anewbe
f6fbe81598 Renames Taj Sign Language 2018-06-29 15:05:13 -05:00
Layne
e7c93ebc94 Only slimes may squish. (#5369) 
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* Squish on my slime

* Squish on my slime
 2018-06-29 14:55:13 -05:00
Anewbe
9b54e62a89 Merge pull request #5361 from Novacat/spriteadd 
Ports Siik'Tajr from Baystation
 2018-06-29 14:49:16 -05:00
Anewbe
3994e0e9ba Merge pull request #5374 from Mechoid/Commwatchbug 
Gloves cannot be put over Commwatches.
 2018-06-25 19:39:16 -05:00
Mechoid
0555c99872 Commwatches aren't rings. Please donut deloot. 2018-06-24 19:32:53 -07:00
Arokha Sieyes
e6a7b744f0 Fix invalid logic in clonepod beaker function 2018-06-24 15:19:49 -04:00
Cameron653
2e987ab900 Alien Cable Coil Fix (#5365) 
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.

* Prevents you from going over the 30 cap.

* Tochat
 2018-06-21 00:26:02 -07:00
Anewbe
71fe7798f6 Ports Fulton Balloons (#5354) 2018-06-21 00:20:11 -07:00
Mechoid
ff827ce831 Fix AI-drone runtimes. Get angry at commits. (#5366) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.

* Fix some AI-drone runtimes.
 2018-06-21 00:18:41 -07:00
Atermonera
04d5f9e522 Merge pull request #5359 from Anewbe/arc_projectiles 
Adds arcing projectiles
 2018-06-17 12:58:41 -07:00
Atermonera
42b624a9ea Merge pull request #5360 from Anewbe/aura_modifier 
Adds aura style modifier code
 2018-06-17 12:58:27 -07:00
Atermonera
6e438655fa Merge pull request #5358 from Anewbe/turret_faction 
Backports turret faction code
 2018-06-17 12:56:27 -07:00
Anewbe
86901354fc More Phase Guns (#5276) 
* Adds new Phase weapons

* Fixes a thing

* Puts phase weapons in cargo

* Moves research designs, adds phase weapons

* Comments out a duplicate design

* Corrects duplicate design ID

* Last commit on this PR, I swear
 2018-06-17 10:35:03 -07:00
Unknown
cfe3a7223d Ports Siik'Tajr from Baystation 
Tail sign language! I was told Polaris might want this?
 2018-06-16 22:58:31 -04:00
Atermonera
32557da8f2 Merge pull request #5356 from Anewbe/recharger_refactor 
Recharger refactor
 2018-06-16 14:15:15 -07:00
Anewbe
109a93b2ac Merge pull request #5357 from VOREStation/pol-overlays 
Use SSoverlays please
 2018-06-16 12:42:16 -05:00
Anewbe
c72807f458 Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter (#5355) 
* Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter

* Changelog

* Corrects liver cost oversight
 2018-06-16 10:41:20 -07:00
Anewbe
53b8a58c76 Adds aura style modifier code 2018-06-16 12:35:40 -05:00
Anewbe
6b8746956a Adds arcing projectiles 2018-06-16 11:37:41 -05:00
Anewbe
16f6a53827 Backports turret faction code 2018-06-16 11:24:48 -05:00
Atermonera
96ea710353 Merge pull request #5350 from Anewbe/weather_nerfs 
Weather is shorter, hail is less deadly.
 2018-06-16 00:27:37 -07:00
Arokha Sieyes
4fb04110d5 Use SSoverlays please 
You have invoked my wrath by not doing this properly!
 2018-06-15 21:51:21 -04:00
Mechoid
313526adb8 Folders props, and adds the laser prism, receptor, and sealed doors. (#5337) 
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
 2018-06-15 20:41:19 -05:00
Mechoid
4cd51ff79f Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 19:14:16 -05:00
Anewbe
1c0867d95f Reworks weather to fit the faster weather ticker 2018-06-15 18:47:19 -05:00
Anewbe
9e28740697 Merge pull request #5322 from VOREStation/pol-planetstart 
Move planets to SSplanets
 2018-06-15 18:05:25 -05:00
Anewbe
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00
Anewbe
8b6377016f Merge pull request #5349 from Woodratt/WR6112018_clothingfix 
Clothing Bug Fixes
 2018-06-14 09:53:19 -05:00
Anewbe
88555dc5f0 Merge pull request #5351 from MagmaRam/coffee 
Fixes "glass of cup of coffee"
 2018-06-13 21:47:40 -05:00
MagmaRam
52367a96c2 Adds a "cancel" option to the Drop-Bomb admin verb. 2018-06-12 22:28:36 -05:00
MagmaRam
9c5492fd00 glass of cup of coffee begone 2018-06-12 21:51:10 -05:00
Atermonera
e8020dec9d Merge pull request #5335 from Anewbe/hair_stealing 
Ports some Bay hair code
 2018-06-12 00:43:43 -07:00
Woodratt
344cb191a5 Clothing Bug Fixes 
- Fix for duster on mob sprite
- Fix for striped swimsuit the on mob sprite
- Fix for hairpin on mob sprites
- Moved Riot and EMT spacesuit sprites to the proper dmi
- Moved combat rig sprite to the proper dmi
- Added a new gasmask (ported from Vorestation). Gasmask with a clear faceplate. Not added anywhere in the playing field
- Radiation hood now will not have hair clip through
 2018-06-11 15:22:13 -07:00
Layne
b4c1722bd6 Sky is not a 'skiy' (#5344) 
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* the skiy
 2018-06-11 13:10:40 -05:00
Anewbe
87929b51d0 Merge pull request #5343 from ReddeyfishVor/slimeChanges 
prevent slimes from spawning on top of people
 2018-06-11 13:10:24 -05:00
Anewbe
58cca27282 Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) 
* Robolimb brand damage tweaks, makes VeyMed more fragile

* Lessens VeyMed damage malus to 10%.
 2018-06-10 17:48:04 -07:00
Atermonera
6f5491de67 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 12:41:06 -07:00
Atermonera
e7ea5b1c69 Merge pull request #5339 from Anewbe/eye_color 
Change-Eye-Color verb should work again
 2018-06-10 12:38:58 -07:00
Reddeyfish
0a616af465 prevent slimes from spawning on top of people 2018-06-10 11:42:42 -07:00
Atermonera
456a1aa37e Merge pull request #5333 from Anewbe/mining_turf_tweak 
Mining turf overlays should be properly placed now
 2018-06-09 12:42:10 -07:00
Anewbe
05fa92c489 Wires are under catwalks, fueltanks are over floor decals 2018-06-09 13:26:30 -05:00
Anewbe
a8be0c1c82 Change-Eye-Color verb should work again 2018-06-08 18:54:49 -05:00