cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,071 Commits 6 Branches 0 Tags
e51a5f18b54a6980bf9ae63219538b39e79ec44f
Commit Graph

32645 Commits

Author SHA1 Message Date
Aronai Sieyes
5b2007a58e Merge pull request #3992 from VOREStation/upstream-merge-5392 
[MIRROR] Prevents dummy AIs from spawning with communicators or PDAs.
 2018-07-11 21:23:57 -04:00
Aronai Sieyes
799594b48f Merge pull request #3991 from VOREStation/upstream-merge-5393 
[MIRROR] Fixes a typo with cups of lime tea.
 2018-07-11 21:22:08 -04:00
Aronai Sieyes
4679dfe24e Merge pull request #3990 from VOREStation/upstream-merge-5391 
[MIRROR] Tweak i_beam qdel logic
 2018-07-11 21:21:19 -04:00
Kates
fd0bfab228 Saber fix. (#5384) 
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
 2018-07-11 00:49:32 -04:00
Atermonera
4526b0d095 Merge pull request #5403 from Anewbe/get_clothing_on_limb 
Limbs can find the clothing that covers them
 2018-07-11 00:38:59 -04:00
Anewbe
a3835d42f4 Merge pull request #5397 from Atermonera/boilerplate_list_fix 
Global list boilerplates cause the target path to actually add to the list
 2018-07-09 22:52:12 -04:00
Little-119
0420b627f2 Stops the prototype trait from showing up 2018-07-09 21:48:34 -04:00
Neerti
5a221f37a4 Merge pull request #5398 from Mechoid/CablePrints 
Cutting cables will now transfer fingerprints.
 2018-07-09 11:39:31 -04:00
Verkister
d60242d2cb Fixes itemweak gurgles ignoring food reagents. 
-Fixes food/drinks/organs/etc. being utterly worthless when gurgled with itemfriendly mode.
 2018-07-09 13:30:32 +03:00
Neerti
aff66f9037 Taj Sign Language works 2018-07-09 02:00:19 -04:00
Little-119
8a3be37570 Enables skin_tone on DSI parts 2018-07-08 22:46:58 -04:00
Anewbe
c84447047c Merge pull request #5395 from elgeonmb/sabsthing 
Adds four new tatoos
 2018-07-08 17:37:55 -04:00
Anewbe
5fff00c4d5 Adds an option to enable/disable markings on synth parts. 2018-07-08 17:36:41 -04:00
Little-119
d68e908c9e Gives vox the trash eating verb 2018-07-07 22:46:27 -04:00
avabee
45cfd410b2 Prevents dummy AIs from spawning with communicators or PDAs. (#5392) 
* Adds an 'is_dummy' variable to AIs.

* Prevents dummy AIs from spawning with communicators or PDAs.
 2018-07-07 14:30:27 -04:00
Anewbe
bfe15d1558 Merge pull request #5393 from avabee/patch-1 
Fixes a typo with cups of lime tea.
 2018-07-07 14:30:16 -04:00
Anewbe
f1049dd1c1 Merge pull request #5391 from VOREStation/pol-infra 
Tweak i_beam qdel logic
 2018-07-06 19:34:44 -04:00
Arokha Sieyes
633bc2cc3d Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync07062018 
# Conflicts:
#	code/__defines/species_languages.dm
#	code/__defines/subsystems.dm
#	code/controllers/Processes/planet.dm
#	code/game/machinery/cloning.dm
#	code/game/machinery/recharger.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/paperwork/photography.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-07-06 17:20:03 -04:00
Anewbe
f0a7b2466e Merge pull request #5390 from VOREStation/pol-planetstartup 
Fixes some planets controller runtimes
 2018-07-05 15:50:15 -04:00
Anewbe
d997ff7a8e Merge pull request #5390 from VOREStation/pol-planetstartup 
Fixes some planets controller runtimes
 2018-07-05 14:49:24 -05:00
Arokha Sieyes
434950bbcc Fixes some planets controller runtimes 
Comes up if you use outdoor turfs in places other than planet z-levels
 2018-07-04 21:58:22 -04:00
Aronai Sieyes
a8b9fa86df Merge pull request #3966 from Verkister/killborg 
Fixes sleeperbellies not ejecting contents on borg death.
 2018-07-04 19:37:39 -04:00
Anewbe
af08909d49 Merge pull request #5389 from VOREStation/pol-hypo 
Fix hypospray exploit
 2018-07-04 11:50:55 -04:00
Anewbe
eb690c0f00 Merge pull request #5389 from VOREStation/pol-hypo 
Fix hypospray exploit
 2018-07-04 10:50:28 -05:00
Atermonera
5a448d9cd5 Merge pull request #5387 from Hawk-v3/master 
Chaplain PDA Bug Fix & Atmos Dedupe
 2018-07-04 01:14:06 -04:00
Atermonera
9a29c6e29e Merge pull request #5387 from Hawk-v3/master 
Chaplain PDA Bug Fix & Atmos Dedupe
 2018-07-03 22:13:12 -07:00
Aronai Sieyes
05989b6aa9 Merge pull request #3971 from VOREStation/upstream-merge-5385 
[MIRROR] Fix handheld Cameras
 2018-07-03 18:52:58 -04:00
Arokha Sieyes
a150728e08 Fix hypospray exploit 2018-07-03 18:05:41 -04:00
Layne
7a79fd407c Changelings Now Succ Traits (#5376) 
Changelings store traits from their victims
 2018-07-03 17:10:27 -04:00
Layne
8b38c3280d Changelings Now Succ Traits (#5376) 
Changelings store traits from their victims
 2018-07-03 14:09:47 -07:00
Aronai Sieyes
3b306e87f0 Merge pull request #3968 from VOREStation/upstream-merge-5375 
[MIRROR] Adds non-head of staff department cloaks
 2018-07-03 15:43:19 -04:00
Aronai Sieyes
c4445e415d Merge pull request #3970 from Novacat/nova-heterochromia 
Fixes USDF Armor Sprites
 2018-07-03 15:41:38 -04:00
Aronai Sieyes
f857592fa0 Basically undo changes 2018-07-03 15:39:58 -04:00
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04:00
Anewbe
2be38d8d90 Fix handheld Cameras 2018-07-03 01:23:04 -04:00
Anewbe
2a696dbbff Merge pull request #5385 from Mechoid/Camerafix 
Fix handheld Cameras
 2018-07-03 00:22:06 -05:00
Unknown
1dc914063b Fixes USDF Sprites 
Fixes #3967 for Ace
(Unfortunately I have no idea how to fix the imperial weapon sound)
 2018-07-03 01:17:11 -04:00
Spades
1528dd37fc Merge pull request #3956 from Jakksergal/master 
Security Overhaul
 2018-07-02 20:49:11 -04:00
Anewbe
0c25bf04a0 Merge pull request #5375 from Mewchild/MC-Cloaks 
Adds non-head of staff department cloaks
 2018-07-02 20:32:14 -04:00
Anewbe
808765ff80 Merge pull request #5375 from Mewchild/MC-Cloaks 
Adds non-head of staff department cloaks
 2018-07-02 19:31:44 -05:00
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
Verkister
9f36a01985 Fixes sleeperbellies not ejecting contents on borg death. 
-Wow it sure took a while before we found out what was forgotten during the original citadel port.
 2018-07-02 13:28:59 +03:00
Jakksergal
909c3fe16d Fixes serious issues. Adds new floor decals. Fixes wires/pipes/lights 
Fixes cell doors not working.
Adds lights to maintenance.
Patches missing pipes in riot control.
Adds a console to toggle N2O injection from observation. Note this is a hacky aproach, the UI doesn't display the right console name.
 2018-07-02 00:55:45 -07:00
Atermonera
308c4b64e0 Renames Taj Sign Language 2018-07-02 00:49:17 -04:00
Aronai Sieyes
bb895947d9 Merge pull request #3950 from VOREStation/upstream-merge-5369 
[MIRROR] Only slimes may squish.
 2018-07-02 00:43:26 -04:00
Aronai Sieyes
c5fc48af3c Merge pull request #3942 from Novacat/nova-heterochromia 
Medical Tweaks
 2018-07-02 00:42:29 -04:00
Aronai Sieyes
2e0e39b627 Merge pull request #3949 from VOREStation/upstream-merge-5361 
[MIRROR] Ports Siik'Tajr from Baystation
 2018-07-02 00:36:20 -04:00
Aronai Sieyes
2827b498cc Merge pull request #3961 from VOREStation/upstream-merge-5380 
[MIRROR] Dungeon walls no longer take damage.
 2018-07-02 00:32:51 -04:00
Aronai Sieyes
9a56255686 Merge pull request #3960 from VOREStation/upstream-merge-5379 
[MIRROR] Fixes an infinite drowsyness bug
 2018-07-02 00:32:35 -04:00
Aronai Sieyes
14b0c1ce67 Merge pull request #3954 from VOREStation/upstream-merge-5378 
[MIRROR] Apportation checks range again
 2018-07-02 00:32:19 -04:00