cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,388 Commits 5 Branches 0 Tags
99ff852e46c4ac0f5303e454290d3cf19b76384d
Commit Graph

15224 Commits

Author SHA1 Message Date
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Chinsky
3c81881686 Merge pull request #6767 from PsiOmegaDelta/OutpostMining 
North Mining Outpost
 2014-10-19 01:42:41 +04:00
Chinsky
b610a78a3d Merge pull request #6769 from PsiOmegaDelta/Science 
HUD overlay improvements
 2014-10-19 01:42:39 +04:00
Ravensdale
431d7a2581 Flower hairpin now works for ears and head slots 2014-10-17 20:12:03 -07:00
PsiOmega
c4a9293727 HUD overlay improvements 
Reduces code duplication, increases code robustness, adds science googles overlay.
 2014-10-17 20:27:40 +02:00
PsiOmega
b9235571c4 Plops down a new mining outpost on the asteroid. 
Rather than having dirty miners inside the pure temple of science they now have a new tiny little outpost for their ore offloading needs.
 2014-10-17 13:49:18 +02:00
Zuhayr
abc00094ca Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-17 06:18:49 +10:30
Zuhayr
f4ab16ef3c Merge pull request #6739 from PsiOmegaDelta/BBag 
Fixes #6735
 2014-10-17 06:16:37 +10:30
Zuhayr
b09591618d Merge pull request #6738 from PsiOmegaDelta/Messaging 
Less PDA confusion.
 2014-10-17 06:16:30 +10:30
Chinsky
1e8222c14f Merge pull request #6750 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2014-10-16 20:07:35 +04:00
Zuhayr
839faaf5d9 Merge pull request #6737 from comma/conscience 
Couple o fixes
 2014-10-16 20:12:54 +10:30
PsiOmega
4507be1430 Fixes #6735 
Moves the open/closing sounds up the class hierarchy, from the statis bag to the body bag.
 2014-10-16 10:03:48 +02:00
PsiOmega
cd940cbf4b Less PDA confusion. 
When writing PDA messages the input window title is now that of the receiver's PDA name instead of the sender's.
 2014-10-16 09:58:59 +02:00
Zuhayr
70dd21ab4c Fixes #6704 2014-10-16 15:04:47 +10:30
Zuhayr
ce06ee46f9 Fixes #6705 2014-10-16 14:57:20 +10:30
Zuhayr
00871b5207 Fixes #6724 2014-10-16 14:47:09 +10:30
Zuhayr
9563a54c7d Fixes #6725 2014-10-16 14:38:51 +10:30
Zuhayr
835e7b20c1 Possible fix for #6729 2014-10-16 14:16:44 +10:30
Zuhayr
87e0d89e58 Fixes #6726 2014-10-16 14:06:30 +10:30
Zuhayr
ca68281371 Fixes #6727 2014-10-16 14:06:16 +10:30
Zuhayr
adb58be3b0 Fixes #6728 2014-10-16 14:02:10 +10:30
Zuhayr
ff9bd99ee7 Fixes #6731 2014-10-16 13:51:25 +10:30
Zuhayr
b611d6515a Fixes #6732 2014-10-16 13:48:26 +10:30
Zuhayr
ffae0eee77 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-10-16 13:39:00 +10:30
Mloc-Argent
4871a3a850 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi
 2014-10-15 22:13:44 +01:00
Zuhayr
fe677543f4 Merge pull request #6721 from PsiOmegaDelta/LazyCaptain 
Map changes
 2014-10-16 05:29:00 +10:30
PsiOmega
68f4f1809e AI PDA tapping fix 
An AI should no longer tap on a non-existing screen with its non-existing fingers while writing PDA messages.
 2014-10-15 17:38:54 +02:00
Mloc-Argent
a18c147c37 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi
 2014-10-15 14:40:42 +01:00
PsiOmega
2acd5c22d2 Space icon 2014-10-15 13:08:09 +02:00
Zuhayr
ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
Menshin
70b2c9a1fa Who thought it was a good idea to omit multiplier for 1x ?!? 2014-10-14 22:48:48 +02:00
Menshin
6387c96bb5 Ambiguous expression readded. 2014-10-14 22:31:19 +02:00
Zuhayr
00e39c1b30 Merge pull request #6715 from Menshin/stacks_href_exploit_fix 
Prevent stacks multiplier href exploit
 2014-10-15 03:22:57 +10:30
Menshin
eb707ea9b6 Prevent stacks multiplier href exploit 2014-10-14 18:34:53 +02:00
Mloc
28e0539359 fix an issue with ZAS geometry not re-forming 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-14 11:57:31 +01:00
PsiOmega
322e03dd06 Makes the number of load/storable character slots a configurable value. 2014-10-14 10:05:22 +02:00
Chinsky
17d5b1dab3 Fixes #6608 2014-10-14 02:19:12 +04:00
Chinsky
ac14ffb455 Fixes #6321 2014-10-14 01:59:48 +04:00
Mloc
be7d30630d Merge pull request #6697 from Zuhayr/dev-freeze 
Xenos fixes, dev freeze fixes.
 2014-10-13 22:25:22 +01:00
Chinsky
c4bc6c3075 Merge pull request #6707 from Mloc/bs12-overflow 
fixes #6299
 2014-10-14 01:15:03 +04:00
Chinsky
d4b7e2d84b Merge pull request #6709 from Mloc/bs12-server 
testing fix for nui resources
 2014-10-14 01:14:54 +04:00
Miniature
1bb1045eeb Fix biosuits hiding shoes when they should not, #6691 2014-10-14 06:29:40 +10:30
Mloc
c6c691bfd9 fixes #6299 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-13 20:35:56 +01:00
Miniature
894ae39f7f Fix for everyone dying if they don't eat 2014-10-14 05:36:47 +10:30
Mloc-Argent
61839da570 testing fix for nui resources 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-10-13 20:01:54 +01:00
Zuhayr
01ddc9af6d Added binary to the AI. 2014-10-13 17:39:00 +10:30
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
c5e2fa74e6 Fixes #6689 2014-10-13 17:16:23 +10:30
Zuhayr
06ad91f417 Fixes #6695 2014-10-13 17:00:26 +10:30
Zuhayr
45d6d6a610 Added Galactic Common to the AI. 2014-10-13 16:45:58 +10:30