cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-22 23:32:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,677 Commits 75 Branches 23 Tags
3fb34237ee3158486d67ff1f76507419e92094de
Commit Graph

4149 Commits

Author SHA1 Message Date
Ccomp5950
a4fc1bfd6a Merge pull request #5886 from mwerezak/stun-baton 
Fixes some handcuff oversights
 2014-08-04 15:15:52 -05:00
Graham Lloyd
2c30af6124 Fireaxe cabinet hacking now fails if player moves away 2014-08-04 14:53:33 -04:00
Atlantiscze
3627417c7b - Adds cyborg module icons. Each component has it's own specific icon now. Two icons are animated, four static. Includes broken versions. 
- AI radio icon (chat icon) updated to use icon from robot_component.dmi file - removed duplicity from radio.dmi
- Cyborg radio icon (chat icon) updated to look like the radio module.
 2014-08-04 09:25:53 +02:00
mwerezak
cf3a37d732 Fixes #5852 2014-08-03 12:32:37 -04:00
mwerezak
cf9fe8de76 Fixes some handcuff oversights 
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
 2014-08-03 11:49:37 -04:00
Walter0o
a586c1dd70 remove double paper/attack() definition 2014-08-03 13:52:47 +02:00
mwerezak
cb2f68f81e Merge remote-tracking branch 'upstream/dev' into power-net 2014-08-03 01:50:51 -04:00
Zuhayr
f510c05865 Merge pull request #5862 from mwerezak/stun-baton 
Stun Baton Nerf
 2014-08-03 12:59:54 +09:30
Whitellama
a36becad2b Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag) 2014-08-01 17:05:54 -07:00
mwerezak
768019b918 Stunbaton fixes and cleanup 
Apparently harm intent is "hurt", not "harm"
 2014-07-31 19:17:05 -04:00
mwerezak
71e54111ab Handcuffs now require an aggressive grab 2014-07-31 18:10:11 -04:00
mwerezak
5b90e4afc6 Allows the use of stun weapons to show up in autopsies 2014-07-31 17:01:06 -04:00
mwerezak
56ccd4303b Merges taser and stun baton effects 
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
 2014-07-31 16:21:22 -04:00
mwerezak
c8cccb64f6 Adds siemens_coefficient handling to stun batons 2014-07-31 15:38:56 -04:00
mwerezak
9bfb4642a2 Merge remote-tracking branch 'upstream/dev' into stun-baton 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	Made all obj/item/weapons have "swing_hit" as their default hitsound.
	Made hitsound not play when the attack misses.
 2014-07-31 14:31:21 -04:00
mwerezak
7130fd124b Stun baton nerf 
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
 2014-07-31 13:39:06 -04:00
Zuhayr
3105297f3e Adjusted spawn procs for heist and nuke. 2014-07-30 21:08:28 +09:30
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
Zuhayr
11a2b0eb3c Merge pull request #5792 from Whitellama/flavourtext 
Dynamic Flavour Text
 2014-07-28 10:11:02 +09:30
mwerezak
5eaebce87e Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-27 20:25:57 -04:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
mwerezak
5f9f6e2054 Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-26 13:56:52 -04:00
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Walter0o
df6ac58d84 fixes nullpointer caused by broken organ list pt 2 
more a prevention than a fix, but meh
 2014-07-26 13:08:25 +02:00
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
mwerezak
79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm
 2014-07-24 16:04:41 -04:00
Mloc-Argent
d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
mwerezak
09280953b2 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/game/machinery/recharger.dm
 2014-07-21 19:40:23 -04:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Zuhayr
6b51645283 Merge pull request #5704 from mwerezak/species-refit 
Fixes object icons not being updated when refitting hardsuits for different species
 2014-07-21 16:09:47 +09:30
mwerezak
e9772faabc Fixes skrell helmet refitting, modkit text 2014-07-20 11:34:46 -04:00
Zuhayr
196fd07384 Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid. 2014-07-20 16:29:18 +09:30
mwerezak
789d3e4d54 Fixes modkits 
Fixes modkits not tracking suit/helmet parts, not checking allowed
parts, and not checking if the clothing needs to be modified.
 2014-07-19 23:17:35 -04:00
mwerezak
e8c4ad07bb Adds a system for refitting species clothing 2014-07-19 22:08:31 -04:00
Whitellama
342a187c8b Eating with utensils now produces the eating sound, fixed #5687 2014-07-19 18:33:30 -07:00
mwerezak
c46904a3b6 Merge remote-tracking branch 'upstream/dev' into power-net 
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm
 2014-07-18 15:02:07 -04:00
Loganbacca
e05b5c0bfb Pipe rendering rewrite 
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
 2014-07-18 13:39:39 +00:00
Mloc-Hibernia
51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl
 2014-07-18 13:15:30 +00:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 13:08:12 +00:00
Mloc
ae9d75bd5e Merge pull request #5664 from Zuhayr/pais 
Mobile pAIs.
 2014-07-18 14:07:11 +01:00
Zuhayr
1345ee5a5c Initial commit for mobile pAIs. Almost guaranteed to be broken as shit. 2014-07-17 23:09:47 +09:30
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
mwerezak
1a52aa7b06 Merge remote-tracking branch 'upstream/dev' into op-hideout 2014-07-16 17:41:30 -04:00
mwerezak
5ca36fcadb Merge branch 'dev' into power-net 
Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl
 2014-07-16 16:14:52 -04:00