cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-31 09:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,715 Commits 7 Branches 1 Tag
9b8387ac050a83b98511de049fc333d2d826a04f
Commit Graph
4997 Commits
Author SHA1 Message Date
Cael_Aislinn 9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:27:44 +10:00
Albert Iordache b78c942f35 Merge pull request #2392 from CIB/master 
Fixes random events
 2013-02-20 15:13:03 -08:00
cib 35bf0648ae Fixes events being broken. 
The proc to get active playercounts was utterly broken, which led to there only being events that needed no specific requirements. Fixed, and made events more common(the only reason people were pissed about so many events was that only the annoying ones would spawn ever).
 2013-02-20 23:05:48 +01:00
Christian Bielert ec54b0501e Merge pull request #2390 from Uristqwerty/master 
Fixed infinite loop in powernet rebuild. (Issue #2385)
 2013-02-20 13:18:21 -08:00
Uristqwerty b1c20c32d7 Fixed infinite loop in powernet rebuild. 
If a /obj/machinery/power wasn't anchored, it wouldn't get a new list of connections, so would endlessly loop on the old list, of which that object was the first entry, ensuring that the loop would never terminate.
 2013-02-20 14:47:32 -05:00
Chinsky b1272bb987 Merge pull request #2378 from caelaislinn/master 
Remove debug string
 2013-02-20 03:02:34 -08:00
Cael_Aislinn 93ef7b83d8 replaced infestation slimes with spiderlings (with 0% chance to grow into giant spiders), reduced spiderling noisiness, made them less jittery (easier to squish) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-20 20:56:09 +10:00
Chinsky 261577317e Merge pull request #2373 from CIB/master 
Several bugfixes
 2013-02-19 06:44:05 -08:00
RavingManiac 839d4cb6c8 Added var/small to mobs, which currently only handles if they can open airlocks. This replaces the use of ismouse(). 2013-02-19 22:10:27 +08:00
RavingManiac 254b5cccd4 Some uses of ismouse() replaced with isanimal() 
world.time used to calculate mouse spawn timer.

Spawn timer now applies to being killed via splat().
 2013-02-19 19:22:00 +08:00
Cael_Aislinn ad227f0925 removed debug string, bumped event intervals, decreased probability of some events 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 15:12:00 +10:00
RavingManiac b2b2894e3b Players have to wait 5 minutes between dying as a mouse and respawning as a mouse. Global variable mouse_respawn_time determines the respawn time in minutes. 
Mice can no longer open airlocks.

Mice can no longer strip items from humans

Mice can no longer put other creatures into disposal units (though they can still climb into disposal units)

Message for when mice crawl into vents removed. Mouse nibbling message only displayed to observers half the time.
 2013-02-19 08:04:53 +08:00
cib 18a552af0a Fixed problem where hostile animals would attack even the dead. 2013-02-18 23:35:51 +01:00
cib 0e70040810 Fix to issue #2371 
Increased the simple_animal/hostile/move_to_delay, which seems to be an entirely separate value for speed. This code is so messed up.
 2013-02-18 23:30:20 +01:00
cib da8e83710f Fixes issue #2367 
Even characters created before nt_relation option now get to choose.
 2013-02-18 23:02:03 +01:00
cib 3df671f8d0 Attempt to fix issue #2371 
- Halves drone speed
- Copied over the exact values from space-carp for spaceproofness, though it should already have worked before
- Untested(whooo uni)
 2013-02-18 22:52:41 +01:00
Cael_Aislinn 743e8f55dd fix for bones spawning weirdly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:33:51 +10:00
Cael_Aislinn 7f4e52e299 replaced carrier reagents with existing chemical reagents 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:31:50 +10:00
Cael_Aislinn ecb02a3acd reduced output message frequency for artifacts and analysis machinery, tweaked tools + finds, added storage item for excav picks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:30:43 +10:00
Cael_Aislinn 040cf2f8d5 tweaked artifact extraction, artifacts 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 02:27:46 +10:00
Cael_Aislinn 31bf502e65 moved a file, add/tweaked some sprites 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-19 01:58:42 +10:00
Chinsky 948e859d80 Fixes #2343 (and #2342), #2356 Readded pre-merge bottle and pill icon choosing system. 2013-02-17 18:31:03 +04:00
Chinsky 0cb4e29a4a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-17 17:51:09 +04:00
Chinsky a68e5d3875 Merge pull request #2333 from Baystation12/BEF-staging 
Merge on the 16th if no issues
 2013-02-17 04:44:25 -08:00
Chinsky 7a94494eee Merge pull request #2354 from Zuhayr/master 
Posibrain fixes (double name, protolathe, double binary)
 2013-02-16 02:22:47 -08:00
Zuhayr 4dd7141e32 Removing a debug string. 2013-02-16 16:19:39 -08:00
Zuhayr 6ad09d49c8 Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally). 2013-02-16 14:21:00 -08:00
Chinsky 8b8556a1b1 Removed requirements for face surgery to cut open head too, real counterintuitive and looks like copypaste error >.> 2013-02-15 02:06:35 +04:00
cib c5301c5144 Fixes issue #2296: Humans will not react to sleep toxins in smaller amounts than can be scrubbed. 2013-02-14 15:06:10 +01:00
cib 5217227f9a Fixes issue #2309: Infected blood now infects again. 2013-02-14 14:45:52 +01:00
Cael_Aislinn ff222c2f13 fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 23:17:54 +10:00
Cael_Aislinn d1e6e342c5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-14 22:10:02 +10:00
cib 4c49e51182 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into BEF 2013-02-14 13:05:27 +01:00
Cael_Aislinn 49e4eaeffb Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 22:02:06 +10:00
Cael_Aislinn f0de14d0d4 fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 21:59:50 +10:00
RavingManiac 4eca9b143e Player-controlled mice spawn next to a vent by default, spawn at MOB_LAYER, can nibble food to regain health, can pass through plastic flaps, and can climb into disposal units. 
Mice cannot pull objects.
 2013-02-14 16:15:20 +08:00
Cael_Aislinn 431002cb30 reduced drone damage + increased health, halved explosion damage (approx) + made exploding more obvious, reduced max drone tech bonus to 6, bit of cleanup in the AI 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 14:58:15 +10:00
Cael_Aislinn 7fba00ce55 miscellaneous fixes + tweaks + cleanups (spoons, artifacts, geotracking, helpers for finds, tools / gear) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 13:28:31 +10:00
cib a9c13cdf37 Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF-staging 2013-02-13 20:13:04 +01:00
Erthilo ed76409141 Fixes mice emotes and Set-Pose verb periods. 2013-02-13 17:10:19 +00:00
Erthilo e5fcb91fb0 Fixes SSD not being prolonged. 
Signed-off-by: Erthilo <erthilo@gmail.com>
 2013-02-13 10:35:09 +00:00
Cael_Aislinn d89c4e744f renamed a file, added rogue drones random event (laser drones spawn and fly around the map, teleport out after a while), added infestation random event (lizards, mice, slimes spawn on the map in some rooms) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 17:50:57 +10:00
Cael_Aislinn e6e4b89819 disabled simultaneous admin PM warning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 17:49:48 +10:00
Cael_Aislinn 7cc207583a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	baystation12.dme

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 12:30:01 +10:00
Cael_Aislinn dd822cc985 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-13 12:26:01 +10:00
Cael_Aislinn bbfbfb0ca2 tweaks to artifact spawning, tweaks and fixes to multiple anomalous artifact effects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 12:23:20 +10:00
Cael_Aislinn b9bd5ca3e2 renamed two files, restructured tools and anomaly suits to semi-final format 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-13 12:22:30 +10:00
cib 31cd43945d Added various new side effects: 
- Headache triggered by bicaridine, alkysine and cryoxadone, treated with tramadol or alkysine
- Cramps triggered by bandages and ointment, treated with inaprovaline
- Bad stomach, triggered by dermaline, kelatone or being cloned, treated with anti-toxin
 2013-02-12 18:20:57 +01:00
cib 1ed5c7ec37 Previously your nanotrasen loyalty setting wouldn't save. 2013-02-12 16:57:33 +01:00
cib 62c906cd30 Merge branch 'feature' of github.com:CIB/Baystation12 into feature 2013-02-12 16:20:50 +01:00