cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,734 Commits 6 Branches 0 Tags
1e8a7d9552000b1b4d24581afc999550e398b51f
Commit Graph

19389 Commits

Author SHA1 Message Date
Zuhayr
1e8a7d9552 Merge pull request #10301 from PsiOmegaDelta/150726-VotingSanity 
Fixes #9894 some more.
 2015-07-27 11:40:14 +09:30
PsiOmega
984d5ee337 More #10285 fixes. 
This one is dev-freeze only.  Adds another sanity check to trans_to_holder to avoid runtime issues.
 2015-07-26 10:46:58 +02:00
PsiOmega
2d24960603 Fixes #9894 some more. 
Ensures the vote sanity check is done first, before any change of vote counts.
 2015-07-26 10:45:05 +02:00
PsiOmega
659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm
 2015-07-26 10:00:12 +02:00
GinjaNinja32
a92dac6df4 Merge pull request #10290 from PsiOmegaDelta/150725-ColdCash 
Fixes  #10203.
 2015-07-26 05:22:49 +01:00
PsiOmega
3c1a3f6951 Fixes #10285. 
Adds Topic() input sanity checking.
 2015-07-25 14:18:10 +02:00
PsiOmega
13ca02677c Fixes #10203. 
setup_economy() was previously called twice, the removed call happened before character creation.
Moves the remaining line to ensure proper setup order.
 2015-07-25 14:08:19 +02:00
PsiOmega
835d4ddcde Fixes #10267. 
Laws are always pre-sanitized.
 2015-07-25 13:30:25 +02:00
Chinsky
cc75e8d220 Merge pull request #10271 from mwerezak/recharging-station 
Fixes #10003
 2015-07-25 05:33:21 +03:00
Snapshot
a13467d8a4 Merge pull request #10286 from comma/tor 
Updates ToR list URL
 2015-07-24 17:31:15 -07:00
Chinsky
0753429740 Updates ToR list URL 2015-07-25 03:27:46 +03:00
Zuhayr
1851ec58cd Merge pull request #10277 from GinjaNinja32/changelingtypo 
Fixes typo in changeling absorbing
 2015-07-25 00:23:37 +09:30
PsiOmegaDelta
9b0497e01e Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-24 10:46:32 +02:00
GinjaNinja32
006ed3ec53 Fixes typo in changeling absorbing 2015-07-24 02:35:49 +01:00
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03:00
Chinsky
390bf93d4d Merge pull request #10261 from PsiOmegaDelta/150722-LawNumbering 
Fixes #10254.
 2015-07-23 21:01:33 +03:00
PsiOmegaDelta
aec2ed05dc Merge pull request #10247 from Kelenius/ofJanicartAndLabels 
Of janicart and labels
 2015-07-23 09:47:15 +02:00
PsiOmegaDelta
83289c1b78 Merge pull request #10273 from Kelenius/ofRobotsAndBoxes 
Of robots and boxes
 2015-07-23 09:15:46 +02:00
Kelenius
7efaab0ab4 Fixes #9540 - borg message when using DA on storage 
Radically. Frankly, this message is useless.
 2015-07-23 10:10:10 +03:00
mwerezak
8b81dadfc5 More cleanup 
Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
 2015-07-23 01:56:39 -04:00
mwerezak
f0bfd03898 Updates recharge station desc when parts are refreshed 2015-07-23 00:07:28 -04:00
mwerezak
d353f30fc1 Fixes #10003 
Fixes numerous issues with cyborg recharging stations, such as incorrect
power use, runtimes when cyborgs exit the station, and odd things like
if(NOPOWER|BROKEN).
 2015-07-23 00:06:39 -04:00
Chinsky
135df023d3 Merge pull request #10265 from Kelenius/ofBeakersAndMicrowaves 
Of beakers and microwaves
 2015-07-22 20:31:45 +03:00
Mloc
30f448cdd2 Merge pull request #10253 from PJB3005/bay-lights 
Lighting: The sanicking
 2015-07-22 14:55:49 +01:00
Kelenius
b83afb10f8 Moves supply pack check down to atom 2015-07-22 13:05:26 +03:00
Kelenius
76fb9ca357 Fixes #9550 - beakers hit microwaves 2015-07-22 12:40:16 +03:00
Kelenius
b637030c21 Fixes #9209 - cargo manifests don't show contents 
This is a correct way of using initial() with a prototype that doesn't
create a new object
 2015-07-22 10:35:22 +03:00
PsiOmegaDelta
ec3faf35e8 Fixes #10254. 
Nothing to see here.
 2015-07-22 08:11:52 +02:00
Zuhayr
3579ab8373 Merge pull request #10259 from mwerezak/rig-module-fix 
Fixes #10151
 2015-07-22 10:45:21 +09:30
mwerezak
c7488c712b Fixes #10151 2015-07-21 20:34:39 -04:00
PJB3005
b6a1ee2adf Lighting: The sanicing 2015-07-21 15:58:39 +02:00
PsiOmegaDelta
9aa79bc6f1 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-21 14:25:46 +02:00
Kelenius
d509bdbbfe Uses capitalize() 2015-07-21 11:58:39 +03:00
Kelenius
83cc80b341 Fixes #9719 - dead goats retaliate 
Goats now only produce a message if they are alive
 2015-07-20 17:01:29 +03:00
Kelenius
6b2daae752 Fixes #6264 - labeling janicart messes its ui 
Janicart now uses nanoui and is immune to labeling screwing up its
interface
I've even resisted making pointless spacing changes this time!
 2015-07-20 16:27:58 +03:00
PsiOmegaDelta
d1ae6b275c Fixes #10244. 
Adds a return statement.
 2015-07-20 09:14:06 +02:00
Kelenius
b6beb8c299 Admin logs for borg hypo 2015-07-20 09:31:02 +03:00
PsiOmegaDelta
ed2a49ba3e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/stacks/medical.dm
 2015-07-20 08:20:40 +02:00
PsiOmegaDelta
c2010bd612 Merge pull request #10236 from mwerezak/robot-custom-icon 
Fixes #10215
 2015-07-19 12:56:00 +02:00
PsiOmegaDelta
8703bcb72d Merge pull request #10238 from mwerezak/sleepygas 
Fixes #9868
 2015-07-19 12:55:25 +02:00
Zuhayr
c4a8ad1156 Merge pull request #10206 from Kelenius/ofBruisesAndBandages 
Of bruises and bandages
 2015-07-19 20:15:47 +09:30
Zuhayr
a45d26079f Merge pull request #10239 from mwerezak/lighting-fix 
Fixes #10210
 2015-07-19 20:13:55 +09:30
PsiOmegaDelta
faa45bfa6f Merge pull request #10240 from mwerezak/machine-frame-fix 
Fixes #10218
 2015-07-19 10:57:17 +02:00
PsiOmegaDelta
cac095e53a Merge pull request #10237 from mwerezak/throw-mode 
Fixes #10230
 2015-07-19 10:55:56 +02:00
mwerezak
b5ed18e980 Fixes #10218 2015-07-19 00:36:18 -04:00
mwerezak
d3717a23a0 Removes unlimited_power var 
Redundant and only used in one place.
 2015-07-19 00:33:17 -04:00
mwerezak
ac2dd5f3ca Fixes #10210 2015-07-19 00:25:09 -04:00
mwerezak
4ea1379b33 Fixes #10230 
Moves throw mode procs up to /mob level, clicking on a non-turf or an
atom that is not in a turf cancels throw mode.
 2015-07-18 23:27:09 -04:00
mwerezak
428138af87 Fixes #10215 
Robot custom sprite config entries are now split at the first dash,
instead of at every dash.
The config is parsed once at startup.
 2015-07-18 23:05:40 -04:00
PsiOmega
b308e34388 Fixes #10170. 
Removes the bunsen burner completely. Was after the chem rework basically never referenced anyway.
 2015-07-18 22:51:20 +02:00