cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 5 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

2182 Commits

Author SHA1 Message Date
Chinsky
5404a18045 Merge pull request #6886 from PsiOmegaDelta/ShoppingList 
Uplink Shopping List
 2014-10-30 22:13:39 +03:00
Chinsky
53aa85fa08 Merge pull request #6887 from Glloyd/fixes 
Fixes #5796
 2014-10-30 22:13:08 +03:00
PsiOmega
253fcc4551 Uplink Shopping List 
At round end players are presented with how which items a given traitor/mercenary team bought, and how much they spent.
 2014-10-30 08:49:50 +01:00
Chinsky
3ab3f86239 Merge pull request #6875 from MagmaRam/dev 
Updated EVA and atmos manuals to match recent game changes.
 2014-10-30 00:10:59 +03:00
Graham Lloyd
d79c0285d4 fixes #5796 2014-10-29 17:03:17 -04:00
MagmaRam
b12674c18c Changed phrasing about pressure with full oxygen internals as suggested by mwerezak. 
Fixed typo pointed out by Glloyd.
 2014-10-29 01:49:28 -04:00
Chinsky
541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA 
PDA newscast reception
 2014-10-29 06:30:54 +03:00
mwerezak
e549a22bba Removes world print, re-adds react() call 
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
 2014-10-28 22:13:42 -04:00
MagmaRam
04c3cb13d3 Updated EVA and atmos manuals to match recent game changes. 2014-10-28 17:10:56 -04:00
PsiOmega
e0796caf56 Fixes #6871. Fixes #6821. 
Amended to match the formatting in #6846, to hopefully avoid merge issues.
 2014-10-28 18:46:11 +01: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
e2a7710491 The AI now has a radio channel for its private frequency. 2014-10-26 22:44:19 +01:00
mwerezak
a0b47ce4de Water cools hot turfs even if they do not have a hotspot. 
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
 2014-10-24 21:45:02 -04:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo 
Conflicts:
	code/modules/power/solar.dm
 2014-10-24 13:32:36 +02:00
Zuhayr
8d9d83d5ef Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-24 09:12:02 +10:30
PsiOmega
8e385c77d0 Generalizes the telecommunication reception check. 
Also happens to fix a bug where a Detomax could blow up PDAs without reception.
Changes a couple of type checks to access checks.
 2014-10-22 16:14:43 +02:00
GinjaNinja32
5b7cb1f117 Fix AI PDA showing tap messages 2014-10-21 16:46:48 +01:00
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
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
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
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
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
Zuhayr
abc00094ca Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-17 06:18:49 +10:30
Zuhayr
b09591618d Merge pull request #6738 from PsiOmegaDelta/Messaging 
Less PDA confusion.
 2014-10-17 06:16:30 +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
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
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
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
Menshin
eb707ea9b6 Prevent stacks multiplier href exploit 2014-10-14 18:34:53 +02:00
PsiOmega
a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase. 
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
 2014-10-13 17:13:04 +02:00
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr
df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
Zuhayr
d0b3a3a39b Merge pull request #6601 from Mloc/bs12-calert 
donut boxes now update their icon to properly reflect their contents
 2014-10-06 19:37:24 +10:30
Mloc
9faec14707 donut boxes now update their icon to properly reflect their contents 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-05 19:24:30 +01:00
RavingManiac
756e9ae030 Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle. 2014-10-04 17:38:38 +08:00
RavingManiac
2aab019cba Binoculars zoom no longer a right-click menu option. Already supplanted by attack_self(). 2014-10-04 04:05:26 +08:00
RavingManiac
f0da0380a5 Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu. 
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
 2014-10-04 04:01:56 +08:00
Zuhayr
e283fa850f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-03 06:58:53 +09:30
PsiOmega
fd060cc5fe Fixes #6546 
Replaces iffy cartridge type checks with access checks.
 2014-10-02 09:29:04 +02:00
mwerezak
3209f19304 Removes unused radio code, world print in forcesay 2014-10-01 21:49:24 -04:00
mwerezak
b88666895b Allows properly keyed headsets to broadcast in robot talk and/or hivemind 
Adds :0 speech code which activates radio-defined behaviour.
 2014-10-01 21:39:02 -04:00
Zuhayr
6c96f3d66b Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev 2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Mloc
dbff924849 fixes #6562 
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 17:48:17 +01:00
Mloc
6a91020529 fixes #6540 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 20:13:03 +01:00
Zuhayr
e2ce1fa2df Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens. 2014-09-30 15:28:30 +09:30
Zuhayr
b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30