cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,388 Commits 10 Branches 0 Tags
99ff852e46c4ac0f5303e454290d3cf19b76384d
Commit Graph

1230 Commits

Author SHA1 Message Date
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
409be10611 merge resolution, mostly removing attack_alien() from modified files. 2014-10-12 02:09:54 +10:30
mwerezak
7a81e116d2 Fixes #6647 
grabbed_by assignment is now done in the grab constructor, instead of
leaking out all over the place.
 2014-10-10 00:23:03 -04:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega
fe126626ac Cleans up radio frequency numbers. 
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
 2014-09-18 13:07:34 +02:00
DJSnapshot
0728a1f8e8 gives warden the ability to use faxes 2014-09-14 20:07:00 -07:00
DJSnapshot
3505ad85d2 Colors fixed. 2014-09-14 17:48:24 -07:00
DJSnapshot
01529c0e29 Adds sol gov fax. Makes replies return to sender fax only 2014-09-14 01:47:55 -07:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
 2014-09-10 22:14:37 +01:00
Zuhayr
29e59ff456 Merge pull request #6289 from comma/overmap 
Overmap
 2014-09-08 11:21:37 +09:30
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Chinsky
fcd1c7749a Tape now does not stop anything like magical wall it used to be. 
If someone with no access walks through it, it adds his fingerprints/fibers, gives him an omnious message and crumples the tape.
 2014-08-29 00:50:33 +04:00
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping. 
fixes a minor oversight in proc order after i shuffled them around.
 2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca emergency HTML/JS injection fix. 
sanitation of status display input was missing everywhere.
 2014-08-27 14:42:58 +02:00
PsiOmega
a1dd07db38 Merge remote-tracking branch 'upstream/dev' into StatusDisplay 
conflicts:
	maps/tgstation2.dmm
 2014-08-26 14:21:29 +02:00
Chinsky
f40298715f Merge pull request #6153 from PsiOmegaDelta/AtmosList 
Central Atmospherics Computer - Air alarm sub-list
 2014-08-26 15:25:59 +04:00
PsiOmega
a3b683d10f Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize(). 2014-08-26 00:03:18 +02:00
PsiOmega
2786c8e8b9 Remote air alarm control for the isolation cells now available on the outpost. 2014-08-25 23:24:35 +02:00
PsiOmega
01be3a37c1 Merge remote-tracking branch 'upstream/dev' into AtmosList. Atmospherics Control Console no longer sorts the machines list, as this is now done elsewhere. 2014-08-25 21:53:17 +02:00
PsiOmega
9eef5ff877 Status displays can now show station time. Also prepares for making brig timer inherit from status display. 2014-08-25 19:30:56 +02:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
Ccomp5950
eaec825fbc Merge pull request #6140 from PsiOmegaDelta/atmos 
Atmospherics computer now displays a sorted list of air alarms
 2014-08-24 12:43:19 -05: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
PsiOmega
e21da52af9 Atmospherics computer now displays a sorted list of air alarms 2014-08-23 15:23:14 +02:00
PsiOmega
ad387fda96 One can now update crew record photos using a security console. 2014-08-22 19:39:35 +02:00
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce 
Announcement Refactoring
 2014-08-21 21:53:03 +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
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
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Chinsky
11f87c849b Added caching of zlevels. 
Currently only condition to cache them is lack of client mobs there.
 2014-08-19 19:05:18 +04: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
Zuhayr
df6723deb0 Merge pull request #6036 from mwerezak/power-net 
Fixes laptop power draw, improves cell chargers
 2014-08-18 21:04:02 +09:30
mwerezak
6d6413a59b Fixes laptop power draw, improves cell chargers 
Cell chargers no longer call use_power() in their process()
 2014-08-17 15:30:29 -04:00
Walter0o
0c6dff3c7a should fix #6030 
basically the same as
569e8361dc
for the computer3 laptop.
 2014-08-17 18:18:07 +02:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2 
More proximity fixes
 2014-08-14 22:55:29 +04:00
GinjaNinja32
95528fb448 Remove inline comments 2014-08-14 11:17:33 +01:00
GinjaNinja32
d1fc12e1c7 More proximity fixes 2014-08-13 20:58:49 +01:00
Atlantiscze
40027d85bd Fixes #5974 
- Fixes possible disappearance bug for Laptops
 2014-08-13 08:19:46 +02:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
mwerezak
58e0b659d4 Reorganizes shieldgen source code and icon files 2014-08-10 11:58:25 -04:00
mwerezak
444d03a335 Fixes #5901 2014-08-10 04:00:20 -04:00
mwerezak
4b070a2de6 Fixes #5935 
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
 2014-08-10 03:44:56 -04:00
mwerezak
3be94d47c1 Updates renwick shield generator 2014-08-10 00:42:25 -04:00
Zuhayr
3e4c80e874 Merge pull request #5848 from JimTheCactus/computer3_text_field_fix 
DNA Field Fix and Field Validation
 2014-08-01 21:59:34 +09:30
Walter0o
06ca10df6b computer3 ntos topic exploit prevention 2014-07-31 09:48:17 +02:00
Walter0o
0aadca2fab computer3 program topic protection 2014-07-31 09:42:26 +02:00
Walter0o
a8baa2c855 computer3 remote view exploit fix 
you could look at any atom for a tick.
could need improvement, does not check camera network at the moment,
because of the costly and temporary nature of the getter proc.
 2014-07-31 09:34:58 +02:00
Walter0o
61a1904e78 prisoner computer3 topic exploit fixes 
fun : you could trigger grenades this way
 2014-07-31 09:28:47 +02:00