cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,167 Commits 5 Branches 0 Tags
e2196fe6eceaffe555f90ba6eded9c4bf861165d
Commit Graph

15850 Commits

Author SHA1 Message Date
Atlantiscze
e2196fe6ec Robotic Cable Coils 
- Cyborgs and Drones can now use change-colour verb to change colour of their integrated cable coil.
 2014-12-01 02:02:11 +01:00
PsiOmega
0731badf87 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm
 2014-11-30 10:54:15 +01:00
Chinsky
1ac4b90368 Merge pull request #7161 from PsiOmegaDelta/MapReaderFixes 
Fixes Map Loader issues.
 2014-11-30 12:51:21 +03:00
Chinsky
dbf69cba81 Merge pull request #7154 from PsiOmegaDelta/SneakyPersonalAIs 
pAIs can now hide.
 2014-11-30 12:50:44 +03:00
Chinsky
c0e54f23cf Merge pull request #7152 from PsiOmegaDelta/RoboCircuit 
Robo circuit
 2014-11-30 12:50:36 +03:00
Chinsky
27736e5ce3 Merge pull request #7137 from atlantiscze/buildable-smes-fix 
Buildable smes minor changes
 2014-11-30 12:50:19 +03:00
Chinsky
edede8ad34 Merge pull request #7153 from PsiOmegaDelta/BeaconBanCheck 
Syndicate Beacons no longer attempt to convert traitor banned players.
 2014-11-30 12:50:12 +03:00
PsiOmega
5e34d12877 Merge remote-tracking branch 'upstream/dev' into RoboCircuit 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
	maps/exodus-1.dmm
 2014-11-30 10:47:36 +01:00
Atlantiscze
0b414ca3db Merge remote-tracking branch 'origin/dev' into nice-atmos 
Had some strange merge problems. This may have broken something. Visual map inspection however shows no problems.
 2014-11-29 23:51:07 +01:00
Chinsky
8cdd094e1b Merge pull request #7156 from PsiOmegaDelta/RadioFix 
Radio fixes
 2014-11-30 00:56:53 +03:00
Chinsky
366badb706 Merge pull request #7165 from PsiOmegaDelta/Joining 
Late-Join Name Addition.
 2014-11-30 00:56:42 +03:00
Chinsky
99cf1ee8f5 Merge pull request #7166 from PsiOmegaDelta/TurfClick 
Fixes AIs seeing runes in the Alt+Click panel
 2014-11-30 00:56:25 +03:00
Chinsky
79562c8f27 Merge pull request #7168 from atlantiscze/syndie-shuttle-docking 
Nukeops shuttle docking
 2014-11-30 00:56:22 +03:00
PsiOmegaDelta
1780b9904f Merge pull request #7164 from Amunak/chat-shenanigans 
Mostly chat-related improvements, mainly adding chattags (icons) to important channels
 2014-11-29 16:07:35 +01:00
Loganbacca
7a94f30da2 Grass seed runtime fix 
Fixes grass seeds causing a runtime when putting a stack through the seed extractor with only 1 tile left in the stack.
 2014-11-30 00:11:47 +13:00
PsiOmega
0f8156e77e Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
 2014-11-29 10:09:03 +01:00
PsiOmegaDelta
6b50ada69b Merge pull request #7159 from mwerezak/logo 
Fixes broken [logo] tag
 2014-11-29 09:49:10 +01:00
PsiOmegaDelta
2899bb31af Merge pull request #7157 from Neerti/11_27_04_borginventory_quickfix 
Fixes potential problem of losing your module items if you get flashed. ...
 2014-11-29 09:49:02 +01:00
PsiOmegaDelta
4c476e70ce Merge pull request #7149 from GinjaNinja32/ghostparam 
Allow ghosts to type the parameters to Jump-to-Mob, Follow, and Teleport
 2014-11-29 09:48:55 +01:00
PsiOmegaDelta
7aadb7999d Merge pull request #7139 from mwerezak/shield-zas 
Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup.
 2014-11-29 09:48:39 +01:00
Atlantiscze
0fda5bf9b8 Nukeops shuttle docking 
- Nukeops (or newly mercenaries) can now dock with the station. Two locations are available, maintenance between virology and xenobiology and arrivals.
- You always have to hack in or be let in. The door won't open on it's own. This is intentional as the shuttle is considered unrecognised by station's docking system. AI or anyone else can open the doors for you if needed.
- Also fixes bug which broke the shuttle console, since someone who was renaming nukeops to mercenaries forgot to change one line in antagonist.dm
 2014-11-29 03:51:45 +01:00
Atlantiscze
bc9fea0fa6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into buildable-smes-fix 2014-11-29 02:42:24 +01:00
mwerezak
b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00
Atlantiscze
12c8b73bdf Fixed exploit that allowed you to generate infinite power by repeatedly disassembling and building SMES with same parts. New SMES would always start on 20% charge. 2014-11-29 01:19:34 +01:00
Amunak
95032936ce Separated pAI and posibrain candidacy, fixed their jobbans. 
You can now toggle special role candidacy for pAIs and Positronic Brains separately. A pAI jobban will now display correctly.  People will be banned from posibrain if they have a jobban on both AI and Cyborg (this is reflected in the character creation GUI as well). Using 'never for this round' on the pAI popup is no longer irreversible.
 2014-11-29 00:31:27 +01:00
Atlantiscze
25ddc19df4 Fractal Energy Reactor can now be mapped in. 
Will be used as replacement for Telecomms magical SMES which is buggy. This thingy should work just fine.
 2014-11-28 21:35:02 +01:00
PsiOmega
2f739975db Late-Join Name Addition. 
When late-joining the name of the currently loaded slot is shown at the top of the job selection screen.
 2014-11-28 20:31:26 +01:00
PsiOmega
fe493c4282 Fixes AIs seeing runes in the Alt+Click panel 
See https://github.com/tgstation/-tg-station/pull/6126.
 2014-11-28 19:36:27 +01:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it. 
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
 2014-11-28 13:05:26 +01:00
Amunak
93b195d78d Fixed a bug that prevented from joining as posibrain. 2014-11-28 13:04:23 +01:00
Amunak
3a5d89a47f Revert "Fixed a bug that prevented people joining as posibrain" 
This reverts commit 643bac47cb.
 2014-11-28 12:59:23 +01:00
Amunak
643bac47cb Fixed a bug that prevented people joining as posibrain 2014-11-28 12:50:52 +01:00
Amunak
44e67b3f53 Posibrain candidates will now be asked twice if they want to join the game 2014-11-28 12:41:31 +01:00
Amunak
2750092045 The analyze-air verb now shows temperature in Kelvins in addition to degrees Celsius. 2014-11-28 12:24:59 +01:00
Amunak
4da6eeb82b Dead chat now uses a single proc for broadcast. Improved dchat formatting, added chattags 2014-11-28 12:23:59 +01:00
Amunak
82322f146e Admin PM cleanup; moved styles to stylesheet.dm, added chattags 2014-11-28 12:05:11 +01:00
Amunak
9e40851998 Moved formatting of admin and mod say channels to stylesheet + added chattags 
This actually removes some stuff from asay and msay. The only place where admins and mods(/mentors/whatever) are distinct now is msay, and only in name: admins have their nick colored like their OOC chat (though this can be changed in stylesheet.dm). Also added the feedback thingy proc call and did some code cleanup.
 2014-11-28 12:02:04 +01:00
Amunak
92d811fd61 Chat tags for OOC and LOOC. 2014-11-28 11:15:53 +01:00
Amunak
7512246c8b Added toggleable 'chat tags' that can mark different channels in chat. 
They are toggleable in the player preferences verb-tab, default is on. They are not necessarily limited to anything, it is just an image in text. The main use is to mark some distinct channels (like OOC, LOOC, admin and mod cheat, dead chat, PMs, ...). To make them more visible, easily distinguishable and perhaps more visually appealing.
 2014-11-28 11:15:22 +01:00
Amunak
6d8818f801 Changed radio colors in attempt to follow a color pallete while keeping readability. 
Also moved stuff around, tried to 'section' the bloody thing.
 2014-11-28 10:37:52 +01:00
Amunak
faf9d34895 Renamed the .admin class to .log_message, which better describes its purpose 2014-11-28 10:26:10 +01:00
Amunak
b21067596c The say verb will try to detect some simple errors (say msay) and warn the sender. 
The sender is allowed to just send, edit or cancel their message.
 2014-11-28 10:22:40 +01:00
Amunak
5dff5228a0 Changed radio format: channel now goes before name 2014-11-28 10:18:42 +01:00
Amunak
bf6a8c5aa5 Adminhelp refactoring, you can now type adminhelp in command box. 
Formatted some code, also added a confirmation for the sender if their adminhelp looks fine.
 2014-11-28 10:16:56 +01:00
Amunak
3e6ebe5d4c Main menu should now be big enough to not display a scrollbar. 2014-11-28 10:12:52 +01:00
Amunak
9103b98982 Cosmetic changes to the menu ready button. 
It works like a toggle switch now.
 2014-11-28 10:11:32 +01:00
PsiOmega
ee45368171 Fixes Map Loader issues. 
See https://github.com/tgstation/-tg-station/issues/6083 and https://github.com/tgstation/-tg-station/pull/6120.
 2014-11-28 08:37:23 +01:00
mwerezak
ff8b57b8c0 Fixes #7144 2014-11-27 23:31:40 -05:00
Neerti
a84b87a1a0 Fixes potential problem of losing your module items if you get flashed. Because copypasta. 2014-11-27 21:58:36 -05:00
PsiOmega
8ae93e2616 Radio fixes 
Intercoms no longer have to check wiring, they can simply use the listening/receiving flags.
Can no longer enable reception/broadcasting if the relevant cables have been cut.
 2014-11-27 17:10:26 +01:00