cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 09:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,209 Commits 8 Branches 0 Tags
bdf5ce72f87ce89f333278f43f173f923f5cb932
Commit Graph

28233 Commits

Author SHA1 Message Date
kcin2001
9f7c777c9d i forgot a quote 2017-08-21 14:21:12 -07:00
kcin2001
a766cc8ed0 Starting to add harpies (first with hair) 
the first in many files and steps
 2017-08-21 14:20:25 -07:00
MagmaRam
499f29354a Merge pull request #3716 from Belsima/zipper 
MORE ZIPPOS
 2017-08-21 13:27:12 -06:00
kcin2001
cde1be5676 actually makes the colorable ones colorable 2017-08-21 12:23:35 -07:00
MagmaRam
1546b25f4c Merge pull request #3698 from Belsima/fbps 
Adds Grayson Manufactories FBPs.
 2017-08-20 21:27:50 -06:00
Cyantime
007dc9c5d9 Reduces mice per pile from 2 to 1. 2017-08-20 21:42:00 -04:00
killer653
eb48f05509 Adds Xenneth custom ID 2017-08-20 21:28:16 -04:00
kcin2001
e8ad23dd04 fixed the tabbing issues and i fucked up commenting out stuff 2017-08-20 17:06:22 -07:00
kcin2001
5262ed0855 uncomments out the colorable heads except for the sentinal 2017-08-20 17:02:43 -07:00
MagmaRam
a3a003fe5b Tesla relays will no longer draw power from the local APC when their device's cell is full. 2017-08-20 17:38:39 -05:00
Anewbe
676fb6daf6 Merge pull request #3694 from SpadesNeil/gun-stuff 
Gun stuff. Some fixes, some changes, and a shiny new SVD
 2017-08-20 11:21:50 -04:00
kcin2001
10a5785080 fixes the black ones to use the right state 2017-08-19 18:04:00 -07:00
kcin2001
942d869625 Adds in xeno heads 
need some assistance with colorable heads
 2017-08-17 22:08:23 -07:00
Cyantime
42ac4a8e27 Removes debug message from list pin. 2017-08-17 18:24:20 -04:00
Cyantime
05e9eb7598 Removes debug messages from color pin. 2017-08-17 18:22:12 -04:00
Neerti
a08f93481f Merge pull request #3713 from Belsima/batterup 
Adds positronic bootup noises.
 2017-08-17 12:01:43 -04:00
Neerti
ea353410d3 Merge pull request #3719 from Cyantime/simplemobiconorder 
Fixes dead simple mobs keeping their resting icon.
 2017-08-17 11:59:53 -04:00
Neerti
ca2ee612d8 Merge pull request #3687 from SpadesNeil/stop-making-devs-cry 
Changes /turf/space/transit icons in map editor
 2017-08-17 11:59:17 -04:00
Neerti
8e8b666b46 Merge pull request #3712 from Belsima/biogen 
Adds more items to the biogenerator.
 2017-08-17 11:58:22 -04:00
Neerti
dc2e629b50 Merge pull request #3718 from Cyantime/mouses 
Safer vent selection for spawned mice.
 2017-08-17 11:57:57 -04:00
Neerti
84756af1a2 Merge pull request #3720 from Cyantime/freezercapupgrade 
Fixes upgrading capacitors in unary freezers doing nothing.
 2017-08-17 11:53:05 -04:00
Neerti
e209c2c707 Merge pull request #3717 from Cyantime/cheaperteg 
Reduces TEG price.
 2017-08-17 11:52:29 -04:00
Anewbe
3650fb1562 Merge pull request #3699 from Belsima/master 
A load of Teshari stuff: For Real This Time
 2017-08-16 22:53:00 -04:00
Cyantime
70a03f1155 No one saw that. 2017-08-16 19:20:57 -04:00
Cyantime
aaef8163be Fixes upgrading capacitors in unary freezers doing nothing. 2017-08-16 17:34:13 -04:00
Cyantime
6958306b60 Gives dead icon priority over resting icon. 2017-08-16 17:09:34 -04:00
Cyantime
abc826320e Safer vent selection for spawned mice. 2017-08-16 16:57:18 -04:00
Gearshy
c19a3c648d Collar icons 2017-08-16 21:11:31 +02:00
Gearshy
a148ffed55 Final-ish pass on shock collars. 2017-08-16 20:50:34 +02:00
Gearshy
42801b9abc Shock Collars: The Empire Strikes Back 2017-08-16 18:07:07 +02:00
Cyantime
80ec86a07c Reduces TEG price. 2017-08-16 10:50:10 -04:00
Gearshy
652749a0b8 Part four of the shock collar saga, and more cleanup. 2017-08-16 16:16:48 +02:00
Gearshy
31de112699 Third time is the perfect time for minor cleanup. 2017-08-16 15:02:08 +02:00
Gearshy
e0f373efd3 Shocking collars, take two. 2017-08-16 14:33:38 +02:00
Gearshy
34a025e1d2 Shock collars, how SHOCKING! 1/? 2017-08-16 14:00:20 +02:00
Belsima
efac0c7e7b fuck i didnt even code the zippos in 2017-08-15 23:59:14 -04:00
Belsima
87f98d3b24 Replaces status frame sprite. 2017-08-15 23:49:34 -04:00
Belsima
fcb471af20 Adds positronic bootup noises. 2017-08-15 23:03:35 -04:00
Belsima
dc3b04b3ce Adds more items to the biogenerator. 2017-08-15 22:54:23 -04:00
Cyantime
0df74e92fe Quik Fixes 2017-08-15 22:19:13 -04:00
Cyantime
499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
Anewbe
7d7bc4cde6 Merge pull request #3705 from Cameron653/master 
Modifies 1 time PAI sprite&speech selection.
 2017-08-15 18:31:20 -04:00
Belsima
8295742f81 More monitors! 2017-08-15 15:02:35 -04:00
Spades
0d5bc38ddf Merge pull request #2015 from Verkister/feedtheborgo 
Enables vore organ borgo fueling.
 2017-08-15 01:22:35 -04:00
Spades
595643a553 Merge pull request #2018 from VOREStation/revert-2003-mousespawn 
Revert "Trash piles can now spawn mice"
 2017-08-15 00:08:58 -04:00
Spades
35c6cbd8b5 Merge pull request #2017 from Cyantime/catbuff 
Buffs cat mouse-catching capabilities.
 2017-08-15 00:08:47 -04:00
Spades
8bbd131899 Better spot to do this in 2017-08-14 23:25:53 -04:00
Spades
60ead7642d Revert "Trash piles can now spawn mice" 2017-08-14 23:07:08 -04:00
Anewbe
ad4b439e96 Merge pull request #3680 from Neerti/8/4/2017_arrivals 
Makes Arrivals Shuttle Great
 2017-08-14 21:59:18 -04:00
Anewbe
d55f8b64d5 Merge pull request #3692 from PrismaticGynoid/wheelchairs 
Better Wheelchairs
 2017-08-14 21:57:27 -04:00