Commit Graph

2931 Commits

Author SHA1 Message Date
KazeEspada
c396ceec1f Merge pull request #920 from Giacomand/revert_compile
Reverting NTSL compile times.
2013-07-07 18:12:54 -07:00
KazeEspada
29012a5953 Merge pull request #917 from Aranclanos/PokeToHits
Spiders and bears response_harm text fix.
Players will now hit spiders and bears instead of poking them when attacking.
2013-07-06 10:37:03 -07:00
Giacomand
5798bc8fb5 Merge pull request #880 from Incoming5643/golem
Golem runes work again - Resolves #769 / Resolves #604
2013-07-05 06:09:59 -07:00
Giacomand
15211ed907 Merge pull request #900 from Aranclanos/QuickEquipDroppings
Quick_equip() dropping items fix.
2013-07-05 06:09:26 -07:00
Giacomand
e9e9f51e00 Merge pull request #898 from Aranclanos/LightBubTK
Light bulbs dissapearing with TK fix.
2013-07-05 06:08:42 -07:00
Giacomand
e5d12518a2 Merge pull request #861 from Aranclanos/MobBump
Bump code spawn() removal and cyborg recharge station rework.
2013-07-05 05:59:18 -07:00
Giacomand
a04daf159f Reverting compile times. They were just annoying and a bad idea. 2013-07-04 23:01:48 +01:00
Aranclanos
851e99f60e Changed the response_harm var from spiders and bears from "pokes" to "hits"
Those were some really strong pokes...

Fixes #687
2013-07-04 11:09:23 -03:00
Cael Aislinn
3da3d35db9 Merge pull request #865 from Giacomand/dscanner
* Detective scanner can receive more detail from blood reagents.
2013-07-03 20:01:24 -07:00
Giacomand
acf7be47f8 Merge branch 'RemoteResources' of https://github.com/Carn/-tg-station into RemoteRes
Conflicts:
	code/modules/client/client procs.dm - Resolved
2013-07-04 01:59:04 +01:00
Cael_Aislinn
a151ee7ecb revert bcaf291
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-07-02 19:35:11 +10:00
Aranclanos
a4e2d0cda3 Using the quick_equip() verb will no longer make you drop your item. It will also stop udpdating all your HUD, instead, it will only update the overlay of your active hand. All other HUD and overlay updates are already handled on the item movements.
If there's no slot available it will show the "You are unable to equip that" message.
Fixes #713
2013-07-02 05:51:50 -03:00
Aranclanos
48d97a57c6 Light bulbs will first drop on the floor before being picked up. Because of the TK grab object on their hand, TK users will be unable to pick up the light bulb and it will stay on the floor. 2013-07-02 04:08:59 -03:00
Cael Aislinn
37dcdfe13f Merge pull request #864 from Ricotez/redoctoberxenoholo
Red October AI Core and Xeno Queen Hologram
2013-07-01 21:10:49 -07:00
Cael Aislinn
6b9a9f6a27 Merge pull request #869 from Ikarrus/mapdoot
Map Update
2013-07-01 21:07:26 -07:00
Cael_Aislinn
bcaf291957 adds a gimmick health hud
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-07-02 13:57:53 +10:00
Giacomand
463d930206 Merge pull request #874 from Aranclanos/CorgiRadiosOff
Corgis rejecting radios fix.
2013-07-01 02:36:29 -07:00
Giacomand
665f192b0e Merge pull request #867 from Aranclanos/DoubleEMP
Two EMPs on items being carried by humans fix.
2013-07-01 02:33:57 -07:00
Aranclanos
22fca13704 Added back the parent of the radio/off to the corgi equip allowed items. (/obj/item/device/radio) 2013-06-29 19:36:19 -03:00
Incoming
84d621ef33 Golem runes work again - Resolves #769.
Additionaly golem faces now inherit from breath masks instead of gas mask so all the golems aren't forever unknown
2013-06-28 18:53:03 -04:00
Giacomand
54669a8f38 Merge pull request #853 from Aranclanos/EngiborgFlamethrowers
Engiborg flamethrower/welder fix.
2013-06-28 04:43:16 -07:00
Giacomand
05b51097c9 Merge pull request #852 from Aranclanos/CargoMails
Wrapping objects not being sorted properly fix.
2013-06-28 04:42:06 -07:00
Giacomand
c986f001dd Merge pull request #837 from Aranclanos/Sleepers
Pulling sleeper exploit fix.
2013-06-28 04:37:03 -07:00
Aranclanos
7b6c1a64ad Updated the type of radio that Ian accepts, I changed it a while ago to reduce it lag so now Ian is rejecting it. 2013-06-27 22:46:21 -03:00
ikarrus
62efe67f70 Map Update
-Redid the HoP office (https://dl.dropboxusercontent.com/u/831776/hopdop2.png)
-Added more walls to the north side of the AI chamber to plug up the holes you could stand in to hide from the turrets
-Added another table in the prison wing to make it easier to see the items
-Replaced loose tools in armory with a single toolbox
-Replaced electric chair in abandoned satellite with an electropack
-Added a little bit more fluff on centcom
-Tweaked engineering maint a little bit so the camera would no longer be able to see into the dead end
-Added missing multitool to atmos
2013-06-27 08:31:56 -06:00
Aranclanos
adc5ff270b Removed the emp_act() of humans, mob/living has a better one.
This will stop EMPs affecting twice items on humans.
2013-06-26 21:23:29 -03:00
Giacomand
d8b1e250ce * Detective scanner can receive more detail from blood reagents.
* Detective scanner no longer scans the reagents of mobs.
2013-06-26 23:21:13 +01:00
Ricotez
ce6b628401 2 new AI sprites.
Added Red October AI Core sprite.
Added Xeno Queen AI Hologram sprite.
Modified AI code so players can use the new sprites.
2013-06-26 23:49:20 +02:00
Aranclanos
063e4c29da Removed all the spawn(0) from bump code and the special check for turfs that rolan7 made a while ago on the mob different Bump() procs.
Added a special check on move() code, only when you're pulling something. If the loc of what you're pulling is the same after you moved, you'll execute the pulling. Otherwise you'll stop pulling. This is to avoid pushing something that you're pulling and moving it back, looking like you didn't do anything. This was "handled" by the spawn(0) procs.

Reworked cyborg recharge stations, they aren't part of the death() and Bump() procs of cyborgs and they act like lockers. Click them to open them and again to close them. Added a sprite for when it's closed with no occupant inside (it's just the closed sprite with red lights instead of a blinking green light).
2013-06-26 07:30:23 -03:00
Giacomand
41ffddc485 Merge pull request #851 from Carn/Issue830
Resolves #830 - ghost_form is only selectable by members.
2013-06-25 10:02:16 -07:00
carnie
26957f5357 Remote resources support.
There is now a PRELOAD_RSC define in code/_compile_options.dm. Setting it to 0 will allow you to use on-the-fly rsc downloads, or the new remote rsc features.

Normally (PRELOAD_RSC == 1) the game will send you all the resources for the game that existed at compile time, this is the long-delay before joining the game...but it means that the game isn't sluggish later on due to trying to download icons and such. Which is good, but uses a lot of bandwidth.

On-the-fly behaviour (PRELOAD_RSC == 0) is when the game only downloads icons when you see something for the first time...this is often responsible for things being briefly invisible on slow connections.

Remote RSC behaviour (PRELOAD_RSC == 0 and some urls defined in config/external_rsc_urls.txt), is a mixture of the two above behaviours. It allows you to connect without downloading lots of resources immediately. However, once you connect it will select a url from a list of urls which hold zipped up copies of the tgstation.rsc. This allows the load of downloading those large files to be distributed across a few cheap web-servers or free upload sites...whilst the main game-server is freed up for other stuff. Should preloading from a remote url fail, behavior will revert to on-the-fly.
2013-06-25 07:44:57 +01:00
Aranclanos
b09e81276c Fixes engiborgs deleting their own welder by creating a flamethrower.
The attackby() of flamethrowers can lead to flamethrower_screwdriver() and flamethrower_rods(). Two new procs that handle the creation of a flamethrower.
New object /obj/item/weapon/weldingtool/largetank/cyborg. This new object does nothing on the flamethrower creation procs.

I'm not entirely happy about this.
2013-06-24 04:34:49 -03:00
Aranclanos
0969a48b55 Merge pull request #835 from Carn/mob_defines
Removed some unused variables in mob definitions:
2013-06-23 23:43:25 -07:00
Aranclanos
dfae7a2ff2 Fixes the "wrapsortjunction", the disposal pipe that sorts wrapped objects. It had a duplicate New() proc.
Gitblame best tool, the award goes to donkie.
2013-06-24 02:46:42 -03:00
Carnie
b649b9070d Merge pull request #836 from Zelacks/hrefpreffix
New player option screen href exploit fix
2013-06-23 22:23:38 -07:00
Carnie
78dc2f4f78 Merge pull request #824 from Giacomand/config_countdown
Made the lobby pre-game countdown timer a configuration option.
2013-06-23 21:58:12 -07:00
carnie
f15d583a68 Resolves #830 - ghost_form is only selectable by members.
ghost_form is now saved with other preferences.
Public visibility of memberships is toggable and saved with other preferences.
ooc-colors for admins and members are now sanitized. Bright colours like Yellow, white and baby-blue will be darkened for the sake of legibility.
Related to above - added helper procs to convert between RGB and HSL colour models.
Admins cannot modify var/unlock_content without +DEBUG rights. unlock_content moved from client into prefs.

Player savefile version number updated - this will trigger savefile updates, no data should be lost.
2013-06-24 05:35:39 +01:00
Cael Aislinn
5450f69367 Merge pull request #826 from Giacomand/tator_typos
Fixed spelling typos. Tratior -> Traitor
2013-06-21 20:15:43 -07:00
Giacomand
e80e588143 Merge pull request #815 from dumpdavidson/punch_monkey
- Fixes issue #780, you can now punch monkeys that are on the floor.
2013-06-21 19:07:56 -07:00
Giacomand
97ea9b759c Merge pull request #814 from Malkevin/weldinggasmask
Welding gas mask
2013-06-21 19:07:22 -07:00
Giacomand
558de58917 Merge pull request #797 from golfer45/master
Fix for debrianed bodies not bleeding
2013-06-21 19:04:16 -07:00
Giacomand
c1aafeec07 Merge pull request #779 from Khubajsn/jobOccupationRightClick
Right clicking a job preference level will now lower it.
2013-06-21 19:02:42 -07:00
KazeEspada
67da9e7c93 Merge pull request #819 from AlexanderUlanH/projectile
Changed atom's bullet_act to call the projectile's on_hit, and changed most bullet_acts to call on_hit as well. Removed some now-unnecessary snowflake code.

These changes will make projectiles which should effect non-mobs, such as the gyrojet and the ion rifle, work properly. Inanimate objects can now be empulsed with the ion rifle, whose projectiles used to dissipate on hitting anything but a mob. Gyrojets now explode on most objects, as opposed to just on walls and mobs, and the snowflake code that made them work on walls is no longer necessary. The code for pulse rifles' breaking walls has been moved from a check in turf to a check in pulse beams, and has been expanded to include structures, allowing them to (slowly) break girders. For coders, it means that on_hit is a reliable proc for the effect of a bullet's hitting an object.

While it does mean a number of needless procs of on_hit, it's not too much more proccing than is already done by the gun code, and the removal of the snowflake code that was used to mask the issue, such as the two checks every time a shot hit a wall, should mostly if not more than offset the extra procs
2013-06-21 17:19:42 -07:00
KazeEspada
b64d0ed2c0 Merge pull request #817 from AlexanderUlanH/tempgun
Makes the temperature projectile get its temperature from the gun, using
a proc used to give the bullet properties based on the properties of the
gun, which can be used with other projectiles for different guns.
Also names the temperature projectile based on its temperature. 500
degrees is not a freeze beam
2013-06-21 17:18:58 -07:00
Aranclanos
88a516acca A world << "" passed, deleting it. Sorry. 2013-06-21 18:08:04 -03:00
Aranclanos
2f3e1eb9e6 Removed a bunch of copy pasted code regarding moving pulled atmos by clicking on turfs or conveyors. Now this is handled by a mob proc, Move_Pulled()
Now all turfs work with this feature. (shuttle shitty turfs didn't because they were not part of /floor)
Added a check on Move_Pulled() to see if the pulled atom is on a turf. This will stop the sleeper exploit and others.
2013-06-21 17:55:32 -03:00
Zelacks
8a605d1cc2 new_player href sanitization
Prevents players from modifying another player's preferences and
character setup.
2013-06-22 04:41:26 +08:00
AlexanderUlanH
0e7a28e1da Fixes clumsiness with prepare_shot
Thanks Kaze
2013-06-20 21:42:11 -04:00
Malkevin
2f8793899f Made it so the proc handles the icon updates 2013-06-21 00:25:05 +01:00
Malkevin
f9507d1438 Moved the copy pasted welder mask toggle stuff into a single proc. 2013-06-20 23:52:33 +01:00