cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 5 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

13050 Commits

Author SHA1 Message Date
Nerezza
812d1b1df4 Filters the lesser borgs 
You now have to be a greater borg (or the god-emperor of borgs) to rename airlock assemblies.
 2016-11-20 16:47:52 -06:00
Anewbe
e2406123e9 Merge pull request #2788 from Yoshax/welder 
Fixes up and implements the experimental welding tool
 2016-11-20 15:22:11 -06:00
Atermonera
ed56e73b83 Fixes #2630 2016-11-20 12:36:18 -08:00
Yoshax
804c67fc00 Removes crate, removes from vending, changes changelog 2016-11-20 20:30:19 +00:00
Yoshax
55c0fc86a3 Fixes up and implements the experimental welding tool 2016-11-20 18:59:06 +00:00
Anewbe
a7986f6500 Merge pull request #2783 from Yoshax/robotsucks 
Allows borgs to use toggle lock on closets/crates
 2016-11-20 12:23:17 -06:00
Yoshax
2c6d023fc7 Changes an attack_ai to attack_robot 2016-11-20 18:04:09 +00:00
MagmaRam
435484e1d1 Merge pull request #2781 from Nerezza/bulkyjumpsuits 
Makes jumpsuits hide under space suits under right conditions.
 2016-11-19 22:22:59 -06:00
Nerezza
df5906dc6b Misc windoor/airlock fixes 
This started as me making robots able to rename windoors and turned into something a little more.
 2016-11-19 21:43:46 -06:00
Yoshax
bf298d9f94 IV Drips are no longer dense 2016-11-20 02:50:44 +00:00
Yoshax
98c1bcb614 Allows borgs to use toggle lock on closets/crates 2016-11-20 01:39:50 +00:00
Nerezza
9bda933376 Makes jumpsuits hide under space suits under right conditions. 
Mostly noticeable on tesh wearing voidsuits, bulky jumpsuits were overlayed by the voidsuit making them 'peek' around the latter's icons.

Now, spacesuits in general will outright hide jumpsuits with exception only to rigsuits. Yeah I'm looking at you rescue suit, you and your ****ed up icons =3=
 2016-11-19 15:52:11 -06:00
Anewbe
aa6cb91bc3 Hackfix2560 2016-11-19 12:41:21 -06:00
Nerezza
7b9be8c922 Gives cyborgs the ability to unbuckle things. 
Checks if what they're attacking 'bare-handed' is adjacent to the cyborg, and has something buckled to it. If not, it passes the click on to AI click like usual.
 2016-11-18 14:49:57 -06:00
Anewbe
1d30a71932 Technomancer changes 2016-11-17 20:11:21 -06:00
Nerezza
07b983a93f Merged branch master into LemonBranch 2016-11-16 16:48:04 -06:00
Nerezza
bdb1096a6b More lemons, plus milk! 
Adds lemon juice and milk to booze-o-mat (not soda fountain) and adds lemon juice cartridges to appropriate Cargo lists.
 2016-11-16 16:47:16 -06:00
Anewbe
cdef74bcdc Lightning spells and bioelectrogenesis will no longer stun outright 2016-11-15 21:49:06 -06:00
MagmaRam
20b6d4be57 Merge pull request #2718 from Anewbe/teargas 
Adds teargas grenades, currently aspawn only
 2016-11-15 20:05:35 -06:00
MagmaRam
890590d89e Merge pull request #2743 from Anewbe/sleeper 
Fixes a sleeper bug
 2016-11-15 20:01:43 -06:00
Anewbe
726015fcd2 Fixes the silent ERT 2016-11-15 18:27:40 -06:00
Anewbe
f646eeaca1 Fixes a sleeper bug 2016-11-14 15:55:31 -06:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing 
Ports sign language
 2016-11-14 14:51:48 -06:00
MagmaRam
8240974ca2 Merge pull request #2740 from Anewbe/autopsy 
Autopsy bugixes
 2016-11-14 14:47:52 -06:00
Anewbe
8e5f9444f7 Fixes the autopsy scanner bugging on print 2016-11-14 14:14:25 -06:00
Anewbe
f7c85b7229 Flashlights in rechargers 2016-11-13 22:33:36 -06:00
Arokha Sieyes
6022963815 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into defib 
# Conflicts:
#	icons/obj/device.dmi
 2016-11-12 14:55:16 -05:00
Anewbe
62c973f631 Merge pull request #2729 from Yoshax/uplinks 
Resolves mercs not spawning with an uplink
 2016-11-12 13:40:41 -06:00
MagmaRam
c3010414d9 Merge pull request #2708 from Anewbe/roundstart_antag 
Allows more jobs to become certain antags after the round starts
 2016-11-12 13:35:55 -06:00
MagmaRam
7f2e507140 Merge pull request #2721 from Anewbe/taperecorder 
Ports Bay's tape recorders
 2016-11-12 13:32:29 -06:00
Yoshax
418ea1b0ba Resolves mercs not spawning with an uplink 2016-11-12 18:13:45 +00:00
Anewbe
3a33b6221d More thing fixes 2016-11-12 12:01:44 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Arokha Sieyes
f3b155b6f3 Switch << to 'to_chat' 2016-11-12 10:35:02 -05:00
Arokha Sieyes
2ea72d692f Drag to apply, reduced to 2 charges 
More balanced maybe? More like 'rounding problems' dividing 1000 by 3 and having it work right.
 2016-11-11 22:59:31 -05:00
Anewbe
9dad9716dc Allows more jobs to become certain antags after the round starts 2016-11-11 20:28:22 -06:00
Anewbe
d453a8dc5b Fixes the Sign over Radio bug 2016-11-11 19:58:46 -06:00
MagmaRam
63fa9bb566 Fixes #2312. Shamelessly lifted from Arokha of Vorestation. 2016-11-11 18:49:05 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
Arokha Sieyes
f1eed186d3 Change to 'normal' cell 
Per staff request
 2016-11-11 00:48:46 -05:00
Arokha Sieyes
5c45086406 Change Adjacent() to get_dist() 2016-11-11 00:35:27 -05:00
Arokha Sieyes
91b61945cc Adds defibrilator kit 
Adds a defib kit. Not ported from /tg/, not a backpack or anything. It's more like an AED than anything. Click with empty hand or drag onto yourself to take the pads out, and put them into some dead person's uniform slot.

Currently has 3 attempts with 75% chance of success with the default battery.

The paddles are cabled, so if you walk away with them it yanks the cable out and you have to reconnect them. Patient can't be moving either, and it won't shock living people (someone can code an emag thing for that I guess?).

(Excludes .dme addition)
 2016-11-11 00:35:20 -05:00
Anewbe
2352001cfb Adds teargas grenades, currently aspawn only 2016-11-10 22:53:59 -06:00
Arokha Sieyes
fa8a20d944 Switch floodlights to smaller battery item 
It was already just editing the charge to the exact same values as the non-high power cell. Why give it a high-power cell? So silly. And misleading if you take the cells and put them other places.
 2016-11-09 13:13:39 -05:00
Anewbe
c20d629e61 Merge pull request #2707 from Anewbe/borgshock 
Fixes borg shocks
 2016-11-08 19:28:17 -06:00
Anewbe
48f654893b Merge pull request #2651 from Anewbe/sting_log 
Ling stings and absorb are logged
 2016-11-08 19:28:09 -06:00
Anewbe
521a79450b Shriek emp is logged again 2016-11-07 21:40:50 -06:00
Anewbe
5bb82a0e25 Fixes borg shocks 2016-11-07 20:45:15 -06:00
MagmaRam
660b22101b Fix for health analyzers only showing multiples of 100% for health. 2016-11-06 16:55:49 -06:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
 2016-11-04 15:42:32 -04:00