cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 16:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,837 Commits 74 Branches 23 Tags
2bc5f44628107feb043a07eae9d69b51a3d2b944
Commit Graph

370 Commits

Author SHA1 Message Date
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c Code relocation. 2015-09-11 08:45:49 +02:00
mwerezak
c8fcdf5170 Makes coffee poisonous to tajaran 
Also fixes skrell protein toxicity not applying when protein is injected.
 2015-09-09 23:11:47 -04:00
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00
HarpyEagle
5e6617e7e6 Cleans up living/say broadcast and verb logic 
Human say_quote() will use the language to obtain a speech verb while
silicon say_quote() will use synth speech verbs, so no need for the extra
language flag. Will mean that silicons will always use their synth speech
verbs regardless of language, however. Logic for what silicons use as
their verb should probably go in say_quote() anyways, so future updates to
that can go there instead of branching in living say code.
 2015-09-09 03:04:18 -04:00
Chinsky
2563821832 Merge pull request #10972 from Zuhayr/resomi 
Adds the Resomi.
 2015-09-06 13:09:34 +03:00
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega
8191ff658e Compilation and code relocation. 2015-09-05 09:29:12 +02:00
Zuhayr
a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
Atlantis
d12002c536 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapfixes 2015-09-01 02:57:36 +02:00
Zuhayr
7f97527471 Merge pull request #10581 from Kelenius/ofMechfabAndPanic 
Updates mechfab
 2015-08-31 17:39:04 +09:30
PsiOmega
080e07976a Removes duplicate camera network definitions. 2015-08-30 15:51:05 +02:00
Atlantis
4189fc3ff6 Adds defines for atmospherics tanks values 2015-08-29 15:53:13 +02:00
Atlantis
46280123ee First implementation of NTNet Software Downloads, Fixes 
- As usual, fixes various issues through the code, but likely creates more as this is still WIP project.
- Most importantly, NTNet software downloader program now exists and more or less works.
- Your device's connectivity has effect on how quickly you can download. Right now, things with wired connection (consoles) download at 0,5GQ/s, mobile devices on station where signal is good at 0,1GQ/s and mobile devices off station where signal is bad are limited to 0,025GQ/s. This is all controlled by three defines.
 2015-08-27 07:09:04 +02:00
Atlantis
e6cbd7866d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-08-25 02:39:23 +02:00
Kelenius
dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm
 2015-08-24 18:16:36 +03:00
Kelenius
6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm
 2015-08-21 16:59:57 +03:00
Kelenius
c1a0661eba Accidentally commited before saving the file. 2015-08-21 16:19:09 +03:00
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
mwerezak
1cb4afd906 Removes CHARGELEVEL_DEFAULT 2015-08-18 17:20:38 -04:00
mwerezak
fd8f6d9639 Removes MASK/HEADCOVERSMOUTH 
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
 2015-08-18 17:20:36 -04:00
mwerezak
ac738f3db4 Moves flags values to item_flags var 
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
 2015-08-18 17:18:25 -04:00
mwerezak
2cb46e035c Removes unused obj flags and fixes overlapping flags 
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
 2015-08-18 17:08:41 -04:00
mwerezak
70b74518a1 Moves BLOCKHAIR flags to flags_inv 
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
 2015-08-18 17:06:50 -04:00
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
mwerezak
d3a40f4269 Cleans up defines 
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
 2015-08-18 17:05:26 -04:00
HarpyEagle
2947a062a8 Decouples shard stepping protection from siemens_coefficient 2015-08-18 17:02:46 -04:00
HarpyEagle
651c2c6ba6 Species spawn_flags 
Moves some more species flags into a new spawn_flags var.
 2015-08-18 17:02:45 -04:00
HarpyEagle
8a9caac7cc Splits species flags 
Splits several species flags off into a separate appearance_flags var, to avoid rollover.
 2015-08-18 17:02:44 -04:00
Zuhayr
e3d9bc90e3 Added more colour defines, added functionality to the floor painter. 2015-08-18 13:41:04 -07:00
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
Zuhayr
0e4c2430d1 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-18 11:59:50 -07:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
PsiOmegaDelta
74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-08-17 09:44:21 +02:00
PsiOmegaDelta
9c08b58534 Code relocation. 2015-08-17 09:38:34 +02:00
Kelenius
3b1c5666d5 Merge branch 'dev' into ofMechfabAndPanic 2015-08-17 09:58:23 +03:00
Zuhayr
84c778959a Added proper gas turfs for atmos, remapped atmos turfs. 2015-08-16 18:18:04 -07:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine 
Can be built and upgraded
Resolves #5215
 2015-08-16 06:07:36 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and 
construction/deconstruction. Major map rework/changes.
 2015-08-16 06:05:21 -07:00
Chinsky
54cb084113 Merge pull request #9997 from PsiOmegaDelta/150702-MoneyMoneyMoney 
Economic strength now depends on race and job.
 2015-08-14 03:56:57 +03:00
PsiOmegaDelta
c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney 
Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm
 2015-08-13 08:06:11 +02:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
Kelenius
012fb38de2 Finalizes mechfab 2015-08-12 21:46:11 +03:00
mwerezak
11d959e767 Adds client image based t-scanner 
Replaces the t_scanner implementation with one that sends overlays to the client holding the t-ray item. Fixes #9437
 2015-08-08 22:26:38 -04:00
PsiOmega
8679887b17 Code relocation. 2015-08-01 19:46:35 +02:00
PsiOmegaDelta
7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta
353f685339 Moves code to relevant define. 2015-07-31 10:00:34 +02:00
PsiOmegaDelta
de3c24c29f Code relocation. 2015-07-30 10:58:03 +02:00
PsiOmegaDelta
ff2b3865b8 Compilation fixes. 2015-07-27 10:41:21 +02:00
Atlantis
dacf0568f3 Update v0.3 
- Lays out structure for item-based modular computers (Tablets)
- Changes how icons for modular computers will be handled.
- NTNet adjustments
- Few fixes
 2015-07-26 21:54:14 +02:00