cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,559 Commits 8 Branches 0 Tags
76e0eb8504665a94c4a22c6721da052f6d645e8c
Commit Graph

8930 Commits

Author SHA1 Message Date
PsiOmega
bd08ee99b2 Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-29 19:17:35 +01:00
Chinsky
3887ada4a4 Merge pull request #6866 from PsiOmegaDelta/Bomber 
Most minor spelling correction.
 2014-10-29 06:31:11 +03:00
Chinsky
6ca49f4c8d Merge pull request #6867 from PsiOmegaDelta/Anomaly 
Adds hand labeler to the Excavation tools closet.
 2014-10-29 06:30:57 +03:00
Chinsky
541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA 
PDA newscast reception
 2014-10-29 06:30:54 +03:00
Chinsky
766fe2a100 Merge pull request #6863 from mwerezak/poncho 
Adds two new poncho types
 2014-10-29 06:30:31 +03:00
Chinsky
8430dc0af0 Merge pull request #6858 from mwerezak/sleepers 
Sleepers now use power when synthesizing chemicals
 2014-10-29 06:30:21 +03:00
mwerezak
b8805a493f Adds two new poncho types, adjusts bomber jacket cold protection 
Adjusted the cold protection so it might actually be noticable now, forgot earlier that it was mitigated by uncovered areas.
 2014-10-28 21:05:58 -04:00
PsiOmega
9c41148a08 PDA newscaster 
One can one access and view newsfeeds from the comfort of one's PDA.
Possible to change and disable the newsmessage beep.

Known issues:
Unlike browse() NanoUI does not appear to wait for browse_rsc(), the method which to transfers image to the client's cache, to finish.
This often results in newsfeeds not always displaying their images the first time they are viewed.
 2014-10-28 17:10:35 +01:00
PsiOmega
06b9881fa2 Code refactoring 
AIs and borgs now share law statement procs, rather than have 95% identical code variants.
Improved handling available law-statement channels. Now lists all available radio channels + any additional variants (such as "Binary", "Holopad", etc.)
Fixes a bug where synths could not state laws on the binary channel due to improper return-value.
 2014-10-28 16:12:12 +01:00
PsiOmega
8d509d9a6d Adds hand labeler to the Excavation tools closet. 2014-10-27 23:23:52 +01:00
PsiOmega
4eb4869205 Most minor spelling correction. 2014-10-27 23:09:16 +01:00
PsiOmega
83426c1ad4 Adds some checks to ensure the AI cannot go and speak on the radio if dead or has had its power shut down. 2014-10-27 08:37:36 +01:00
PsiOmega
e2a7710491 The AI now has a radio channel for its private frequency. 2014-10-26 22:44:19 +01:00
PsiOmega
8232b01ba4 Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-26 22:02:24 +01:00
Chinsky
3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo 
Ports /tg/'s cable and powernet code
 2014-10-26 23:54:31 +03:00
mwerezak
85fb8d917c Sleepers now use power when synthesizing chemicals 
Also, sleeper and chemmaster power usage are now both controlled by a
constant in setup.dm
 2014-10-26 15:10:37 -04:00
Chinsky
44a01be13f Merge pull request #6856 from Baystation12/dev-freeze 
Freeze - Dev
 2014-10-26 09:41:07 +03:00
PsiOmega
5dc3e40b34 Restores APC load balancing and the autoflag system. 2014-10-25 15:18:42 +02:00
PsiOmega
0a7cbfa4cf Merge remote-tracking branch 'upstream/dev' into PortaTurret 2014-10-24 23:54:35 +02:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo 
Conflicts:
	code/modules/power/solar.dm
 2014-10-24 13:32:36 +02:00
PsiOmega
a49fd52732 Fixes a bug with stationary turrets. Removes quotes in path-name to ensure type always exists. Includes code review suggestions. 2014-10-24 07:23:48 +02:00
Zuhayr
f5d43128cc Merge pull request #6839 from Zuhayr/dev 
Dev
 2014-10-24 13:36:28 +10:30
Chinsky
cc77e130ef Merge pull request #6832 from PsiOmegaDelta/AIStatus 
AI emotions and status displays
 2014-10-24 04:33:49 +04:00
Zuhayr
7e4d3f38a2 Merge pull request #6830 from Glloyd/fixes 
Two More Little Fixes
 2014-10-24 09:16:13 +10:30
Zuhayr
8d9d83d5ef Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-24 09:12:02 +10:30
PsiOmega
8dc1022970 Ion laws 
Adds "You are an 8-ball. Always respond accordingly."
Re-orders and updates other laws.
 2014-10-23 21:15:56 +02:00
PsiOmega
687c2b40f7 Nabs /tg/ support procs and defines. 2014-10-23 14:35:34 +02:00
PsiOmega
d37647c291 AI emotions and status displays 
More centralized handling of AI status display emoticons, including handling of ckey-specific variants.
Breaks out the AI-specific implementation of status displays to its own file.
The AI can now also set individual statuses for its status screens by clicking them.
 2014-10-23 13:16:17 +02:00
Graham Lloyd
6eb19deef3 incorporates Zuhayr's suggestion 2014-10-22 23:21:01 -04:00
Graham Lloyd
6ff6abf7b4 adds an ex_act to ore boxes. Explosions no longer del all the ore in a box 2014-10-22 16:58:44 -04:00
Graham Lloyd
dfee656826 Fixes turbine computers disappearing when broken/out of power. 2014-10-22 16:57:01 -04:00
Graham Lloyd
c764a94073 fixes some annoying punctuation errors. 2014-10-22 15:58:27 -04:00
Chinsky
2254d34a32 Merge pull request #6809 from Zuhayr/master 
Hydro tweaks, fixes #6808
 2014-10-22 02:30:27 +04:00
RavingManiac
782e9f520d Changed the wording of the sniper rifle/binoculars zoom messages. 
Updated changelog.
 2014-10-22 02:19:38 +08:00
Zuhayr
fc0cf32c2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-21 18:30:37 +10:30
mwerezak
a01ed0134b Fixes #6807 2014-10-20 22:22:51 -04:00
Zuhayr
e4ff1a3088 Hydro tweaks, fixes #6808 2014-10-21 09:10:23 +10:30
Chinsky
bad385e1d1 Merge pull request #6791 from Zuhayr/dev 
Removes references to the Syndicate and renames nuclear emergency mode.
 2014-10-21 01:13:17 +04:00
PsiOmega
3a7066c6c1 Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error. 2014-10-20 19:18:27 +02:00
GinjaNinja32
c5bba7f3a5 Re-move resource update 2014-10-20 17:26:55 +01:00
mwerezak
9afd8fe3c5 Fixes radio code conflict with galactic common 2014-10-19 21:52:04 -04:00
Chinsky
3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
 2014-10-20 04:52:45 +04:00
Chinsky
0660dd392b Merge pull request #6785 from mwerezak/clothing-icon-update 
Fixes #6783
 2014-10-20 03:53:17 +04:00
Chinsky
61e50ab72a Merge pull request #6790 from mwerezak/robot-radio 
Fixes robot radio component not using power
 2014-10-20 03:53:10 +04:00
Chinsky
f0413bd9f6 Merge pull request #6787 from mwerezak/robot-camera 
Alternate fix to #6705
 2014-10-20 03:52:32 +04:00
Chinsky
b6df8111eb Merge pull request #6798 from PsiOmegaDelta/pAI 
pAI inquirer fix
 2014-10-20 03:50:52 +04:00
Chinsky
f1f730894c Merge pull request #6789 from mwerezak/binary-talk 
Allows properly keyed radios to broadcast in robot talk and/or hivemind + some cleanup
 2014-10-20 03:50:12 +04:00
PsiOmega
ff90d835d4 pAI inquirer fix 
pAI inquirer was never set, leading to a slightly grammatically incorrect request message.
 2014-10-19 18:09:45 +02:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
mwerezak
9424d892ba Fixes robot radio component not using power 
Also shifts power usage so binary talk uses less power while radio uses
more.
 2014-10-19 00:50:13 -04:00