cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,539 Commits 8 Branches 0 Tags
b9b33018cd282c02d7a8cce75d56ef327bbc99be
Commit Graph

24223 Commits

Author SHA1 Message Date
Anewbe
b9b33018cd Allows emptying of ashtrays into disposals 2016-11-14 22:10:59 -06:00
MagmaRam
568b1eacfe Slimes will now dump reagents they can't process. 
They won't throw up a runtime and then refuse to process more stuff.
 2016-11-14 15:51:17 -06:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing 
Ports sign language
 2016-11-14 14:51:48 -06:00
MagmaRam
95ae417f21 Merge pull request #2736 from Anewbe/robobrand_cleanup 
Robobrand disks now come in their own crates, prices increased
 2016-11-14 14:51:36 -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
aa93f8436e Projectiles now log for autopsy reports 2016-11-14 14:14:10 -06:00
Anewbe
f7c85b7229 Flashlights in rechargers 2016-11-13 22:33:36 -06:00
Anewbe
2899f65653 Merge pull request #2720 from VOREStation/defib 
Defibrilator Kit
 2016-11-13 16:19:21 -06:00
Anewbe
189a9a4329 Brand disks now come in their own crates, prices increased 2016-11-13 16:03:03 -06:00
MagmaRam
127d26f80e Merge pull request #2735 from Anewbe/borgzaps_again 
Robots should not be shocked by wires/machines
 2016-11-12 21:45:07 -06:00
MagmaRam
8dae3942f0 Merge pull request #2719 from Anewbe/half_gas 
Ports bay's half gasmak
 2016-11-12 21:44:24 -06:00
Anewbe
0418911e0b Robots should not be shocked by wires/machines 2016-11-12 21:35:55 -06:00
MagmaRam
5eff6494cd Merge pull request #2712 from Anewbe/turban 
Turban doesn't cover beard
 2016-11-12 14:17:50 -06:00
MagmaRam
b0aa1a11cd Merge pull request #2715 from Anewbe/loincloth 
Fixes loincloth sprite
 2016-11-12 14:16:48 -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
1c0ef59dba Merge pull request #2694 from Anewbe/surgery_fix 
Fixes some surgery bugs
 2016-11-12 13:32:56 -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
Yoshax
102c0c2277 Makes clipboards producible out of wood 2016-11-12 01:26:20 +00:00
Anewbe
d3d290b9f3 Merge pull request #2717 from MagmaRam/concealed_carry 
Concealed holsters, suits hiding accessories.
 2016-11-11 19:08:20 -06:00
Anewbe
36d7361b15 Merge pull request #2726 from MagmaRam/cryo_clone_fix 
Fixes #2312. Shamelessly lifted from Arokha of Vorestation.
 2016-11-11 18:57:23 -06:00
MagmaRam
63fa9bb566 Fixes #2312. Shamelessly lifted from Arokha of Vorestation. 2016-11-11 18:49:05 -06:00
MagmaRam
7e48491593 Well that wasn't supposed to be there. 2016-11-11 18:38:20 -06:00
MagmaRam
c0486a164f Changed the visible holsters back to not being an entire subclass. 2016-11-11 16:39:17 -06:00
Anewbe
727e184210 Merge pull request #2710 from Leshana/world-topic-manifest 
Fix world/Topic()'s manifest to include synthetics like datacore.dm
 2016-11-11 15:59:46 -06:00
Anewbe
b8018065bc Ports sign language 2016-11-11 15:43:03 -06:00
Arokha Sieyes
5a5a50f7b0 Improves bandanas 
No more tie verb. Just put it into whatever slot and it (correctly) adjusts the needed stuff to work. Added 'Can be worn on the head or face' to the description to indicate that.

Currently wearing a bandana on your head makes it impossible to eat, which doesn't make sense, so this fixes that too.
 2016-11-11 10:51:35 -05: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
cc2d9d9528 Ports bay's half gasmak 2016-11-10 23:08:29 -06:00
MagmaRam
bff4e6a4e1 Makes clothing actually hide stuff, fixes a couple odd related bugs. 2016-11-10 18:00:31 -06:00
Anewbe
49face1006 Might fix Travis 2016-11-10 17:49:20 -06:00
Anewbe
f9012b6100 Fixes loincloth sprite, removes them from xenogear (they're in shorts selection) 2016-11-10 17:35:44 -06:00
MagmaRam
b418d57dd6 Makes it so that holsters can be hidden by suit-slot items. 
I have yet to actually make any suit-slot items hide holsters.
 2016-11-09 23:23:19 -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
9664e09ae7 Turban doesn't cover beard 2016-11-08 20:43:54 -06:00
Anewbe
2f1cdf2454 Merge pull request #2706 from Anewbe/antag 
Surplus crates will no longer make more surplus crates
 2016-11-08 19:31:44 -06: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