cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,041 Commits 8 Branches 0 Tags
c41aa0b29ca4d04fba43be596673610366ca5d73
Commit Graph

13246 Commits

Author SHA1 Message Date
Datraen
3181e8aeeb Merge pull request #797 from Kelenius/lathefix 
Fixes #94
 2016-01-24 18:19:48 -05:00
EmperorJon
37ee02c110 Merge pull request #836 from Datraen/BayCherryPickTest 
Cherrypicks from Bay
 2016-01-24 15:22:44 +00:00
Zuhayr
9bf30a4e7a Fixes odd synth brain bugs. 2016-01-24 15:11:33 +10:30
Spamcat
588e072b9d Fixes #11681 2016-01-23 20:33:50 -05:00
ccomp5950
f65581b1c8 Fixes #10942 
The portion that generates the list just performs a null check, not a length check.
So we initialize it as null instead.
 2016-01-23 20:27:57 -05:00
Jon
cbbb1f8344 Fight me 2, fight me boogaloo. 2016-01-24 00:47:52 +00:00
Jon
706d720757 Fight me etc. 2016-01-24 00:35:23 +00:00
Neerti
d5cefa6384 Merge pull request #824 from Mark9013100/1/22/2016actionbuttons 
Adds action buttons for hard-hats and goggles
 2016-01-22 22:59:08 -05:00
Mark9013100
8194c3ca61 Adds action buttons for hard-hats and goggles 2016-01-22 20:27:58 -05:00
Atlantis
58b9ec24ea Allows AIs to send emergency messages to central 
- This is probably more of a bugfix than feature, since the actual code that allows message sending seems to already be in there.
- Requested by Minijar.
 2016-01-22 18:49:47 +01:00
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
Zuhayr
8f3b545b10 Merge pull request #815 from Kelenius/qdeltest 
Optimizes asteroid generation
 2016-01-22 01:50:37 +10:30
Zuhayr
7901d97f09 Merge pull request #809 from Earthcrusher/EC_new_borgie_sounds 
Adds two new sounds little borgie butts can make: *yes and *no.
 2016-01-22 01:49:37 +10:30
Neerti
17dcb5ede1 Merge pull request #811 from Zuhayr/gunhands 
Added functionality for two-handed gun use.
 2016-01-21 09:12:40 -05:00
Earthcrusher
1e93d6e408 Allowed humanoid FBPs to use the new borg sounds as well. Added entries for "yes" and "no" to the synthetic *help list. 2016-01-21 02:48:15 -06:00
Kelenius
9f7b65faf8 Optimizes asteroid generation 2016-01-21 11:42:18 +03:00
Datraen
8c9ee94eb8 Merge pull request #808 from Yoshax/mobfix 
Fixes #796
 2016-01-20 21:15:18 -05:00
Zuhayr
0a2cf6ad46 Converted two-handed weapons to use the same wielding mechanic as guns. 2016-01-21 01:40:40 +10:30
Zuhayr
f89948d666 Added functionality for two-handed gun use. 2016-01-21 00:51:54 +10:30
Yoshax
f87b120dd5 Fixes #796 2016-01-19 19:11:05 +00:00
Earthcrusher
41df41e549 Adds two new sounds little borgie butts can make, *yes and *no. 2016-01-19 12:59:00 -06:00
Zuhayr
930fcccb97 Properly cleans up the mmi_holder Destroy() proc. 2016-01-19 21:46:07 +10:30
Kelenius
671b3b2d96 Removes copypaste 2016-01-18 16:04:01 +03:00
Kelenius
ee531578d7 Fixes #94 
Protolathe and CI will now correctly eject materials.
 2016-01-18 15:06:33 +03:00
Zuhayr
1acb009c6a Merge pull request #791 from Dibasic/patch-5 
antique laser description typo fix
 2016-01-17 18:44:17 +10:30
Dibasic
6b77ec868e antique laser description typo fix 
there wasn't a period this adds a period
 2016-01-16 18:02:41 -06:00
Yoshax
b558fb795f Changes observe message to reflect correct respawn timer 2016-01-16 23:10:15 +00:00
Mark9013100
ea6231215f Clarifies a few custom loadout items 2016-01-15 12:29:07 -05:00
Neerti
23aa869e8a Revert "Removes gun firing logs due to possible lag." 2016-01-14 00:27:06 -07:00
Yoshax
eda657a272 Adds orange and violet hairflower pins 2016-01-13 19:51:37 +00:00
Zuhayr
e92615bc24 Robotic limbs and non-DNA mobs will now respect gendered icons. 2016-01-14 01:44:23 +10:30
Zuhayr
7d1aa59de6 Fixes #715 2016-01-14 01:08:21 +10:30
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Zuhayr
887c174926 Fixes #260 2016-01-14 00:17:50 +10:30
Zuhayr
ff798be5c5 Fixes #676 2016-01-14 00:12:47 +10:30
Zuhayr
18e4c7fa8e Fixes #776 2016-01-13 23:57:38 +10:30
Zuhayr
a3e5649523 Fixes #755 2016-01-13 23:51:45 +10:30
Zuhayr
004687abaa Merge pull request #708 from Hubblenaut/coffee 
Coffee Shop
 2016-01-13 23:34:10 +10:30
Zuhayr
98352cf09c Merge pull request #767 from EmperorJon/12_Jan._Mask_coverage_fixes 
Fixes mask coverage
 2016-01-13 23:23:34 +10:30
Hubblenaut
42b7acea8b Merge remote-tracking branch 'upstream/master' into coffee 2016-01-13 02:19:22 +01:00
Hubblenaut
721728d3dd Adds porcelaine cups 2016-01-12 19:42:43 +01:00
Jon
9a303ea576 Fixes mask coverage. 2016-01-12 18:21:29 +00:00
Neerti
91e7700999 Merge pull request #759 from GinjaNinja32/pl-cable 
Fix Baystation12/Baystation12#11955, fix #479
 2016-01-12 01:17:58 -07:00
Neerti
cbdff5d241 Merge pull request #746 from Datraen/TeleCrystal-Item2 
Gives telecrystals tech levels, restores PDA default to new PDA.
 2016-01-12 01:17:17 -07:00
Zuhayr
1702765073 Hackfix for impossible-to-remove cuffs. 2016-01-12 16:27:15 +10:30
Zuhayr
40b7c087c9 Attempting to fix perma-wet-floors bugs. 2016-01-12 15:50:20 +10:30
Zuhayr
0c2ec6422a Merge pull request #727 from Mark9013100/1/3/2016edits 
Edits/Changes, 1/3/2016
 2016-01-12 04:31:38 +10:30
Zuhayr
34b139b714 Merge pull request #761 from EmperorJon/11_Dec._Adds_Ward_Takahashi_prosthetics 
Add's Ragnie's Ward-Takahashi prosthetics to the game.
 2016-01-12 04:26:56 +10:30
Jon
a28f08e6c2 Add's Ragnie's Ward-Takahashi prosthetics to the game. 
This should be all that's needed, I think?
 2016-01-11 17:51:50 +00:00
GinjaNinja32
12a38a3610 Fix #11955 2016-01-10 22:26:47 +00:00