cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,194 Commits 5 Branches 0 Tags
117ca6a1356aee9d4b25e96fba63ba46a01be2b1
Commit Graph

15876 Commits

Author SHA1 Message Date
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
PsiOmegaDelta
a1a66870ca Merge pull request #7203 from Zuhayr/unarmed 
Refactoring the context-based combat PR v2
 2014-12-01 11:17:14 +01:00
Zuhayr
487117a0ae Reverting a now unneeded var change. 2014-12-01 20:42:32 +10:30
Zuhayr
bee0b9d23d Tweaks after testing. 2014-12-01 20:20:30 +10:30
Zuhayr
d65ead4f7e Changed \red to span in unarmed_attack.dm. 2014-12-01 20:10:27 +10:30
Zuhayr
0ae473b6ea Removed antag role buffs. 2014-12-01 20:06:43 +10:30
Zuhayr
855f75bd3c Removed magboot stomp. 2014-12-01 20:03:08 +10:30
PsiOmegaDelta
e18d5f51f9 Merge pull request #7172 from Neerti/11_29_14_minor_borg_drone_changes 
Minor changes to drone borg sprite.
 2014-12-01 06:46:46 +01:00
PsiOmegaDelta
651008b822 Merge pull request #7176 from Amunak/super-patch 
Supermatter fixes, code cleanup and refactoring. Shards don't announce anything.
 2014-12-01 06:46:28 +01:00
Zuhayr
016a9d8ba2 Merge branch 'unarmed' of https://github.com/Zuhayr/Baystation12 into unarmed 2014-12-01 15:33:07 +10:30
PsiOmegaDelta
e5c5209f7a Merge pull request #7183 from Zuhayr/dev 
Hardsuit fixes.
 2014-12-01 05:58:24 +01:00
Zuhayr
0903bd7fc5 Working on some suit bugs, attempted to fix the welding overlay issue with no success. 2014-12-01 01:51:52 +10:30
Zuhayr
14cf4aa8e3 Refactored mag grippers a bit. Kinda hate myself for writing them the way I did, but hindsight etc 2014-12-01 00:37:13 +10:30
Zuhayr
9b5235016b Set the hazmat rig to use the medical rig icon for now. Woo placeholder sprites. 2014-11-30 23:50:54 +10:30
Zuhayr
3a312b4a03 Fixes #7179 2014-11-30 23:49:55 +10:30
Zuhayr
a5ee32d4ca Fixes some colour macros, removes inactive jetpack icon for rigs. 2014-11-30 23:47:34 +10:30
Zuhayr
7703b0f4c0 Fixes #7186 2014-11-30 23:47:12 +10:30
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
Zuhayr
4c1ea8cd3a Several hardsuit fixes. 2014-11-30 12:46:03 +10:30
Zuhayr
c7973e0ab2 Made suit boots children of magboots. 2014-11-30 11:12:15 +10:30
Zuhayr
1500dbd505 Fixes #7128 2014-11-30 10:52:35 +10:30
Amunak
5a8a9c2816 Supermatter warning now has its own proc. Fixed some SM bugs. 
Added logging for when SM explodes. The delay of regular warning was made *higher* (from 15 to 20 seconds) because of a bug; Delay of the emergency warning was lowered (from 30 to approx. 12 seconds). The announcement of 'returning to safe levels' now happens only once. The  spawn .. explosion and irradiation and hallucinations are now also applied only once (which means they may need some tweaking, but I have no idea if they stacked anyway; mainly the code should now be much more efficient).
 2014-11-30 00:23:55 +01:00
Amunak
45b314bd60 Moved shard to the bottom of the file, tweaked its values. 
Also added the time between delamination and actual explosion (pull time) as a separate val and lowered it for the shard.
 2014-11-30 00:16:54 +01:00
Amunak
889442ef93 Supermatter code formatting 2014-11-30 00:07:54 +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
Neerti
9cf2b467b9 Fixes the 'drone' sprite for borgs. The eyes are now actual eye sprites instead of attached to the base sprite. No more pumping 40 shots into a secborg and wondering why it won't die. 
Adds option for medical module to use the medical drone sprite.
Adds sprite for surgery and mining.  Mining will no longer use a medical sprite (why???)
 2014-11-29 14:49:08 -05:00
Amunak
cc576db683 Fixed compile error because I don't know how istype() works 2014-11-29 20:33:37 +01:00
Amunak
309cf59f71 Supermatter shards now don't announce anything 2014-11-29 19:59:06 +01: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