cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 13:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,918 Commits 9 Branches 0 Tags
014729a001b51af3a665684fbe68a3c3e3489ef1
Commit Graph

16446 Commits

Author SHA1 Message Date
Zuhayr
f31ffb11c2 Fixes #6752 2014-10-18 08:09:50 +10:30
Zuhayr
96be563434 Fixes #6740 2014-10-18 08:03:46 +10:30
Zuhayr
e7e50e9f51 Fixes #6745 2014-10-18 07:57:18 +10:30
Zuhayr
b7bdb3ce06 Fixes #6759 2014-10-18 07:56:11 +10:30
Zuhayr
dcca5ccb6e Fixes #6763 2014-10-18 07:52:27 +10:30
Zuhayr
08ca8e192a Fixes #6764 2014-10-18 07:38:33 +10:30
Zuhayr
9eb2809afb Fixes #6765 2014-10-18 07:34:46 +10:30
Hubblenaut
5cf2281db6 Hotfix for broken damage reading 2014-10-17 21:04:08 +02: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
DJSnapshot
92ed4e5609 xenos need to hiss too 2014-10-16 22:09:48 -07:00
DJSnapshot
7ddd61b45c sanity check on facehuggers. 2014-10-16 21:56:43 -07:00
DJSnapshot
fc45762f18 removing world debug message. 2014-10-16 21:19:01 -07:00
Zuhayr
e147c60c50 Makes heist unvotable and fixes the language bug with spawned vox. 2014-10-17 14:20:39 +10:30
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
mwerezak
e53bd0e237 Merge remote-tracking branch 'upstream/dev' into faxmachine 2014-10-15 21:12:21 -04:00
mwerezak
b0cdcc9796 Adds photocopier based faxmachine, removes redundant photocopier vars 2014-10-15 21:07:57 -04:00
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
PsiOmega
1cabbbf5a6 Master controller no longer annihilate powernets, powernets annihilate themselves. 
Some misc. changes.
 2014-10-15 09:44:15 +02:00
PsiOmega
9bc9698998 Sets turn-off limits based on a standard cell's max charge 2014-10-15 08:14:10 +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
PsiOmega
9bcbdc6dc5 Fixes bad tabbing, only evident when placing Z-crossing cables. 2014-10-14 14:14:46 +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