cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,911 Commits 5 Branches 0 Tags
20571bf1ce5d16d52204723002ef8c8cc261cbfc
Commit Graph

1253 Commits

Author SHA1 Message Date
Zuhayr
660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
Zuhayr
0f0bca6889 Merge pull request #7038 from mwerezak/diona-scream 
Fixes #7026
 2014-11-19 23:11:50 +10:30
DJSnapshot
9d5ba587ac Mentors don't need faxes, communications, or prayers. 2014-11-17 15:08:36 -08:00
mwerezak
9eb6dfdef4 Fixes #7026 
Uploads species var from human to carbon mobs.
 2014-11-16 14:43:38 -05:00
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
PsiOmega
0f47a615e3 No more sleeping in closets 
Removes the 2-tick sleep cause by every closet in New().
Moves the code that sucks up items into closets to initialize() to avoid processing still null objects.
 2014-11-11 11:07:05 +01:00
Ccomp5950
28635e3f8f Merge pull request #6958 from PsiOmegaDelta/TimeOfNews 
Newscaster and photo cleanup
 2014-11-07 01:00:18 -05:00
Chinsky
4c027495a3 Merge pull request #6953 from GinjaNinja32/laptopvendor 
Fixes newly-vended laptops opening windows and giving close messages
 2014-11-07 03:46:12 +03:00
PsiOmega
77c52f48a8 Newscaster and photo cleanup 
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
 2014-11-06 13:28:17 +01:00
Chinsky
8078ffe079 Merge pull request #6939 from PsiOmegaDelta/VerbOptimization 
Verb optimization
 2014-11-05 23:23:56 +03:00
GinjaNinja32
7a5b965907 Fixes newly-vended laptops opening windows and giving close messages 2014-11-05 17:06:01 +00:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega
cb6a855292 Cyborg detonation notice 
When a cyborg is detonated by a cyborg console  the AI is now notified about the event.
Violently applied destruction remains without notice.
 2014-11-03 19:40:24 +01:00
PsiOmega
bf1e6af508 Z-Level Compatibility 
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
 2014-10-30 14:29:56 +01:00
Chinsky
541d878d54 Merge pull request #6865 from PsiOmegaDelta/PDA 
PDA newscast reception
 2014-10-29 06:30:54 +03: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
8e3861141c Merge branch 'dev' into PowerTwo 
Conflicts:
	code/modules/power/solar.dm
 2014-10-24 13:32:36 +02: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
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
mwerezak
b8cfe87ca2 Fixes #6783, moves spacesuits to a separate file 
Adds an update_clothing_icon() proc to clothing items that will call the
relevant icon update proc on the mob which is equipping the clothing, if
any. Changes various clothing procs to not call update icon procs on usr
which may not even be the mob wearing the clothing.
 2014-10-18 22:12:15 -04: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
5989a0c625 Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it. 2014-10-12 11:48:54 +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