cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 18:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,936 Commits 2 Branches 1 Tag
8fe013d531d7e5458cc6cea3120c531c4ff31b7f
Commit Graph

13320 Commits

Author SHA1 Message Date
Zuhayr
8fe013d531 Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened. 2014-06-24 03:21:27 +09:30
Zuhayr
1cfb9b6ea1 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-22 21:58:46 +09:30
Zuhayr
183ee20ab6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-06-22 21:58:30 +09:30
Zuhayr
bb8951a53c Makes forks usable. 2014-06-22 21:49:55 +09:30
Mloc
af60005aad Merge pull request #5317 from comma/master 
Couple o fixes
 2014-06-22 11:13:29 +01:00
mwerezak
1a74db2110 Merge remote-tracking branch 'upstream/dev' into train-cleanup 
Resolved merge conflicts, and added some more user feedback to attach/unattach procs.

Conflicts:
	code/modules/vehicles/cargo_train.dm
 2014-06-21 11:29:10 -04:00
Chinsky
15536d27a4 Fixes #5264 
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.
 2014-06-21 17:52:59 +04:00
Zuhayr
baeca85704 Merge pull request #5321 from mwerezak/diona-lang 
Fixes #5299
 2014-06-21 19:11:50 +09:30
Zuhayr
4dc6028caf Merge pull request #5316 from Jarcolr/master 
Fixes #5283 and #5315
 2014-06-21 19:11:37 +09:30
mwerezak
3f9fbc680b Fixes #5299 2014-06-21 02:07:47 -04:00
Loganbacca
f0c32f4d23 Vehicle layer tweak 2014-06-21 17:56:07 +12:00
mwerezak
2737171337 Cleans up train latching/unlatching 
Also adds a verb for turning off train engines.
 2014-06-21 01:30:40 -04:00
Loganbacca
d6022017c8 New vehicle loading code 
- Vehicles now load items on them somewhat like roller beds, allowing you to interact with them
 2014-06-21 14:13:25 +12:00
Ccomp5950
68d01b00ab Merge pull request #5297 from comma/fancy 
Nextgen lights
 2014-06-20 20:30:11 -05:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
Chinsky
b7832f862a Fixes #5311 2014-06-21 00:58:31 +04:00
Jarcolr
90e08a15b3 Fixes #5283 and #5315 
All it took was some fancy switches.
 2014-06-20 23:20:45 +03:00
Zuhayr
33fa88e27a Merge pull request #5309 from mwerezak/flashbang 
Fixes #5186
 2014-06-20 21:23:34 +09:30
Chinsky
78142a7cc2 Merge pull request #5276 from caelaislinn/xenoarchaeology 
Xenoarchaeology
 2014-06-20 14:41:25 +04:00
Cael Aislinn
22cc2558ff switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 18:42:38 +10:00
Cael Aislinn
f02e6fdd45 rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-20 18:42:25 +10:00
mwerezak
25e333a39b Fixes #5186 2014-06-20 02:48:12 -04:00
Chinsky
6f6cf57a93 Merge pull request #5277 from Jarcolr/dev 
Adds paths for therapy dolls from #2731
 2014-06-20 09:02:03 +04:00
Hubblenaut
8a4739197e Merge branch 'backup' into medical 2014-06-19 15:36:28 +02:00
Mloc
a00128c0ad Merge pull request #5280 from comma/virus-racism 
Diskette size change
 2014-06-19 14:21:19 +01:00
Chinsky
f7e14c8f99 Merge pull request #5282 from Jarcolr/master 
Partially fixes #5255 and walking over asteroid edges
 2014-06-19 17:03:06 +04:00
Zuhayr
39acf41328 Merge pull request #5293 from mwerezak/armour 
Allows armour to turn sharp attacks into blunt attacks with some probability
 2014-06-19 21:08:39 +09:30
Zuhayr
21be85445e Merge pull request #5303 from mwerezak/objectives 
Fixes a missing config check in autotraitor.dm
 2014-06-19 21:08:34 +09:30
Zuhayr
69d25ea048 Merge pull request #5301 from mwerezak/cargo-shuttle2 
Docking Controllers Stage 3: Cargo Shuttle
 2014-06-19 21:08:29 +09:30
Zuhayr
2a804244e3 Merge pull request #5279 from comma/guestid 
Guest passes
 2014-06-19 18:06:47 +09:30
Chinsky
0fbbd7f066 Merge pull request #5288 from laser50/patch-1 
Returns ..() on Microwaves
 2014-06-19 12:22:04 +04:00
Chinsky
b2337d0c51 Merge pull request #5289 from laser50/patch-2 
Adds ..() on Chem Masters
 2014-06-19 12:21:58 +04:00
Cael Aislinn
ad35bf3262 harvester can now harvest artifact's secondary effect, which effect it chooses is determined by which are active (if both are active it can harvest neither) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 15:41:35 +10:00
mwerezak
cd971fb4ea Fixes a missing config check in autotraitor 
Also adds a config check to the various forge_* procs just to be sure.
 2014-06-19 00:01:47 -04:00
Cael Aislinn
fc99c5b65f miscellaneous fixes to various anomaly utiliser effects involving location/holder issues, fixed anomaly harvester runtime, reworks anomaly utiliser to be a lot easier/nicer to use, balance tweaks: 
- caps stun effect values for pulsing
- sets max utiliser battery charge to 300 (30 sec)
- changes energy consumption for utiliser pulse effects to "effect max charge level" * "effect range" ^ 2
- changes energy consumption for utiliser touch effects to 100 (10 sec worth of consumption)

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 13:52:21 +10:00
mwerezak
c28fd0ecb5 Adds supply shuttle docking controllers 2014-06-18 21:25:17 -04:00
mwerezak
5006ebde14 Makes the supply shuttle process in a tighter loop 2014-06-18 21:24:57 -04:00
Cael Aislinn
f3ab8b0748 moved xenoarchaeology master controller code into a separate file 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 11:07:12 +10:00
Cael Aislinn
0e1c367012 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 11:06:20 +10:00
Cael Aislinn
6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology 
Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-06-19 10:05:27 +10:00
mwerezak
e46c3c8834 Renames supply controller global var 
Renamed from 'supply_shuttle' to 'supply_controller'
 2014-06-18 19:37:46 -04:00
mwerezak
462593f0b5 Adds supply shuttle datum 2014-06-18 19:37:30 -04:00
Zuhayr
ce69599a3a Whitelists diona nymphs. Forces them not to have universal_speak. 2014-06-19 08:48:58 +09:30
Zuhayr
8fa57539a5 Merge pull request #5295 from boopcat/happydrones 
fixes
 2014-06-19 08:23:13 +09:30
Hubblenaut
5e8a82bb0a Fixes text color in advanced trauma kit surgery step 2014-06-18 23:11:01 +02:00
Hubblenaut
909c2d44a9 Removes medical belts from lockers 2014-06-18 22:35:56 +02:00
Chinsky
ded321d5c1 Nextgen lights #3: Fire 
Fire now emites colored light, pretty rad.
 2014-06-19 00:16:19 +04:00
Chinsky
ceecd7abc9 Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast. 
Adjusted color mixing helper to use inbuilt procs.
 2014-06-18 23:45:25 +04:00
Chinsky
9e3ad09b8c Shortened helper. 
Added new helper for alternative mixing.
 2014-06-18 23:44:11 +04:00
Chinsky
2396c6d882 Nextgen lighting #2: Lights 
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
 2014-06-18 20:38:33 +04:00