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

8480 Commits

Author SHA1 Message Date
PsiOmega
1084a1d6d7 Optimization of machinery sort? 2014-08-24 22:52:51 +02:00
Chinsky
23576ffdb6 Merge pull request #6154 from PsiOmegaDelta/Traitor 
Code phrase/response no longer randomly assigned
 2014-08-24 23:12:19 +04:00
Chinsky
63dc3424f0 Merge pull request #6142 from PsiOmegaDelta/sec_hud 
Sec-huds can now handle alt-titles.
 2014-08-24 21:45:34 +04:00
Chinsky
7d18ddfab1 Merge pull request #6146 from PsiOmegaDelta/Dylovene 
Renames anti-toxin bottles to dylovene.
 2014-08-24 21:45:00 +04:00
Chinsky
5fa876d9f5 Merge pull request #6144 from PsiOmegaDelta/Cryo 
Improved cryo object-recovery
 2014-08-24 21:44:45 +04:00
Ccomp5950
3104b0421e Merge pull request #6141 from PsiOmegaDelta/Radio 
Department radio use on join
 2014-08-24 12:44:12 -05:00
Ccomp5950
6e8722de53 Merge pull request #6120 from PsiOmegaDelta/Sanity 
Can again create newfeeds
 2014-08-24 12:30:53 -05:00
Ccomp5950
fd37cf44e3 Merge pull request #6104 from mwerezak/power-net 
Fixes for APCs (from dev), fix for solars area, and simple APC load balancing
 2014-08-24 12:26:29 -05:00
PsiOmega
61d40e2405 Non-random traitor code word assignment. 2014-08-24 12:47:48 +02:00
PsiOmega
b5ff2048ab Is now possible to create a sub-list of air alarms the atmos control console will list. 
Will be used to allow scientists on the outpost to remotely control their isolation cell air alarms.
 2014-08-24 12:35:47 +02:00
Chinsky
12d3dadc5f Merge pull request #6112 from PsiOmegaDelta/med 
Fixes #6106
 2014-08-24 01:58:53 +04:00
Chinsky
58a05802c0 Merge pull request #6110 from PsiOmegaDelta/Sec 
Fixes #5984 by having ED-209s now pass through each other.
 2014-08-24 01:58:33 +04:00
Chinsky
2c73f3b2d5 Merge pull request #6107 from mwerezak/dev-fixes 
Fixes rad suits not completely protecting against radiation
 2014-08-24 01:58:26 +04:00
Chinsky
60d3dc5178 Merge pull request #6117 from PsiOmegaDelta/Camera 
Camera names are now sanitized
 2014-08-24 01:57:23 +04:00
PsiOmega
f19001feb8 Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific. 
Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269
 2014-08-23 17:22:04 +02:00
PsiOmega
54706d79b3 Sec-huds can now handle alt-titles. 2014-08-23 16:03:51 +02:00
PsiOmega
f8aebd6853 Improved cryo object-recovery. 
Cryo object-recovery now offers a list of items to recover, when one wish to recover a single object, instead of directly disgorging the first item it finds.
 2014-08-23 15:38:31 +02:00
PsiOmega
bca85c8921 Adds a brief description on how to use the department and other channels on join. 2014-08-23 12:13:49 +02:00
PsiOmega
d8b803d5e3 Fixes #6130 
The construction outpost now has an air supply and rudimentary distribution system.
Glass and wood stacks are filled to their max stack sizes, 50 and 32 sheets respectively.
Ghosts can now teleport to Z-level 4.

There are now special air alarms which do not broadcast their alarms. These are used in the mass driver areas to let crew know when it's safe to use them again.
These air alarms have also been installed in the Research isolation cells to finally allow scientists to check what's up, at least as long as they are in there or have AI assistance.
 2014-08-23 10:20:24 +02:00
mwerezak
56068092d0 Merge remote-tracking branch 'upstream/dev-freeze' into power-net 2014-08-22 17:41:12 -04:00
PsiOmega
dfa960c55b Can again create newfeeds. 
sanitizeSQL returned nothing most likely because the input more often than not is not proper SQL.
Removes the check and replaces strip_html_simple with strip_html to match all other sanitizing calls in the class.
 2014-08-22 22:48:58 +02:00
PsiOmega
ad387fda96 One can now update crew record photos using a security console. 2014-08-22 19:39:35 +02:00
PsiOmega
98cbc8f220 Camera names are now sanitized. 
When assembled camera no longer default to names such as "The mproper Central Primary Hallway (632)" but instead "Central Primary Hallway (632)".
 2014-08-22 14:16:46 +02:00
PsiOmega
e7385e829b Fixes #5984 by having ED-209s now pass through each other. 2014-08-22 12:31:47 +02:00
PsiOmega
6fa9ebddc2 Fixes #6106 and prevents placing a mountain of humans on the same op-table. 2014-08-22 12:14:01 +02:00
Ccomp5950
7db352fcc6 Merge pull request #6075 from MrSnapwalk/ertv3 
ERT update 3: electric boogaloo.
 2014-08-22 05:01:02 -05:00
mwerezak
ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
 2014-08-22 01:24:34 -04:00
mwerezak
1477fe17ab Fixes apply_effect() used without armour checks 2014-08-22 00:02:50 -04:00
Raptor1628
5a030ac82b Brig Fixes Clean 
Includes all the previous fixes, plus removes loyalty implants from HoS
locker
 2014-08-21 20:58:00 -04:00
mwerezak
006c98bcdd Merge remote-tracking branch 'upstream/dev-freeze' into power-net 2014-08-21 20:25:58 -04:00
mwerezak
5d97c9d6a2 Fixes fore solars control room area 
Also changes solar area requires_power and always_unpowered to match
area/space
 2014-08-21 20:11:23 -04:00
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce 
Announcement Refactoring
 2014-08-21 21:53:03 +04:00
Chinsky
575ce7a6bd Merge pull request #6093 from Walter0o/disposals_fix 
fixes #5907
 2014-08-21 21:49:21 +04:00
MrSnapwalk
195805636b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3 2014-08-21 11:40:35 -05:00
Walter0o
ff8047baa0 fixes #5907 
issue caused by relaymove() not being checked properly.
added comment to prevent this kind of issue in the future.
 2014-08-21 15:41:28 +02:00
Chinsky
f559a7eb85 Merge pull request #6079 from PsiOmegaDelta/PipeDrop 
Allows clicking floors to drop pipes
 2014-08-21 17:34:13 +04:00
PsiOmega
f9df93fad0 Expands the use of the new announcement system. 
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
 2014-08-21 12:58:02 +02:00
Chinsky
77066d1f62 Merge pull request #6078 from PsiOmegaDelta/TurretExploit 
Fixes turret exploit
 2014-08-21 12:09:28 +04:00
PsiOmega
68bf885e6b Announcement system refactoring. 
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast

Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.

Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
 2014-08-21 06:34:41 +02:00
Zuhayr
ee499426ad Compile fixes. 2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
MrSnapwalk
7a2ee219ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3 2014-08-20 19:43:29 -05:00
Chinsky
fd486ea369 Merge pull request #6064 from PsiOmegaDelta/Announce 
AI Announcements & Verbs
 2014-08-21 01:37:55 +04:00
PsiOmega
67752bd40b Allows clicking (simulated) floors to drop pipes 
This makes it possible to install pipes under immovable objects, similar to power cables.
 2014-08-20 12:21:42 +02:00
PsiOmega
30c581c8b3 Fixes an exploit reported at tgstation/-tg-station#4491. Credits to @MrPerson for the fix. 2014-08-20 10:46:09 +02:00
MrSnapwalk
9b464d268c ERT update 3: electric boogaloo. 2014-08-19 21:46:27 -05:00
PsiOmega
a2253617cf Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration. 2014-08-19 21:09:14 +02:00
Ccomp5950
770fb4de4c Merge pull request #6052 from PsiOmegaDelta/Mapping 
Fixes #6027
 2014-08-19 12:01:14 -05:00
igalan
322c5b53f2 Fixes #6054 2014-08-19 17:50:55 +01:00
Chinsky
c7257c1bf2 Added handling for space travel/stragglers. 
Now new empty space levels are created if needed.
Added config option to use overmap system, ticked files in.

Conflicts:
	code/setup.dm
 2014-08-19 19:05:17 +04:00