cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-08 16:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,652 Commits 2 Branches 1 Tag
05bb07375eb3c8bbe970e5e3402fff9558c2c1ca
Commit Graph

3318 Commits

Author SHA1 Message Date
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Segrain
367c1cf4f4 Better check. 2013-10-11 11:10:27 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00
Segrain
a4793fd208 Typo fix. 2013-10-11 10:08:04 +03:00
Mloc
3821fb2ab3 Merge pull request #3745 from comma/ghosts 
Fancy ghosts!
 2013-10-10 03:06:40 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Chinsky
463adc446f Fancy ghosts! 
Now ghost will look like char preview / mob at moment of death.
Even MMIs have goasts now.
 2013-10-06 16:10:47 +04:00
Chinsky
9000854ddc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into viro 2013-10-06 14:10:20 +04:00
Mloc
c79f33b932 Merge pull request #3732 from comma/sideeffects 
Side Effects Strike Back
 2013-10-06 03:09:29 -07:00
Chinsky
f53fa1dee2 Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro 
Conflicts:
	code/modules/virus2/disease2.dm
	code/modules/virus2/effect.dm
 2013-10-06 13:34:50 +04:00
Chinsky
784b98d151 Side effects overhaul. 
Fixed cure message spam, now they do not remanifest while cure is still in system.

Changed yiming of side effects. They now start gatherping power only when their cause is no longer active. Around 180 ticks after that they start hurties.
This way they can be cured without either giving huge doses of cure (so they outlast the causing chem) or immediate remanifesting.
Because of way that loop works (and I am too lazy to think of other way, since ithis one is not that bad) you can only cure them when they are in active phase, so just adding cure to same pill won't do.

Also I axed out last damaging stages of side effects, since they are intended to be just an annoyance, not a disability.
 2013-10-06 11:59:47 +04:00
Chinsky
f42631bdbe Adds contact-spread viruses. 
Infection chance now calculated differently for airborne and contact ones.

Contact viruses spread on: infected people touching others, people touching naked infected people (clothed parts do not spread it).
Airborne viruses spread on: breathing (20% chance, then chance depending on worn clothing), coughing (now 2 tiles instead of 1)

Both types spread from mucous and blood puddles because lazy.

Fixes:
Blood and mucus now spread viruses correctly.
Lowered output of hyperzine generation syndrome, since it caused dedly ODs.
 2013-10-06 08:49:51 +04:00
Chinsky
95c85e4059 Merge branch 'virofixes' into viro 2013-10-06 05:23:47 +04:00
Mloc-Argent
9ab11c0aeb virus fixes. WIP will update commit message later 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-05 18:52:08 +01:00
Chinsky
1f53ed0591 Merge pull request #3722 from Baystation12/master 
Master -> Dev
 2013-09-30 16:01:20 -07:00
Chinsky
82bd221aa3 Fix for #3667 2013-10-01 01:15:02 +04:00
Chinsky
8eb2f7db67 Fix for #3686 
Thign now drops all stuff before turning into a tree.
 2013-09-30 23:12:50 +04:00
Chinsky
b87669f592 Fix foe #3713 
Megaphones will have to be fixed separately, since they are on dev branch.
 2013-09-30 20:49:44 +04:00
Chinsky
92625f8384 Merge pull request #3716 from DJSnapshot/bugfix 
Auto-transfer voting Redux: Episode 2.
 2013-09-30 07:53:49 -07:00
DJSnapshot
6d3caf78a6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bugfix 2013-09-26 22:34:51 -07:00
DJSnapshot
8a83008e62 bugfix for custom AI sprites. 2013-09-26 22:32:23 -07:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Segrain
a24fd41829 Fixes for typos. 2013-09-19 08:37:29 +03:00
Segrain
0b661bc854 Fixes for stacks. 2013-09-19 08:34:38 +03:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
Segrain
91068e31c8 Falling fix. 2013-09-13 19:45:22 +03:00
Segrain
3dd5b22ae7 Fix for #3662. 2013-09-13 19:24:25 +03:00
SkyMarshal
92f389546b Removes the gas mask filtering stuff from gas mixtures. Moved it into the relevant "life" code. 2013-09-11 12:09:23 -07:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Zuhayr
161ec9ab98 Minor language token fix. 2013-09-09 21:52:23 -07:00
Zuhayr
55865f7b1e Added key to Check Languages. 2013-09-09 21:51:04 -07:00
Zuhayr
a5234383e1 Check Language verb. 2013-09-09 21:50:52 -07:00
Zuhayr
b0d7a95189 Merge pull request #3644 from DJSnapshot/master 
Gave mods dsay command and unique dsay identifier
 2013-09-03 22:46:39 -07:00
Zuhayr
1b6d76f004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-09-03 23:46:04 -07:00
Zuhayr
3019942102 Minor language token fix. 2013-09-03 23:40:07 -07:00
Zuhayr
f3631ba21e Added key to Check Languages. 2013-09-02 21:43:30 -07:00
Zuhayr
3f36adb002 Check Language verb. 2013-09-02 21:03:30 -07:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Zuhayr
a8f0d5c4c2 Merged bullets.dm. 2013-09-02 14:16:53 -07:00
Erthilo
afcfed02bd Moved gas_filter_strength out of clothing and into gas masks. 2013-09-02 17:38:42 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
a4829a271e Gas mask filters Plasma and N2O. 2013-09-01 20:51:19 +01:00
Erthilo
4f4fb38baf Changed pin to a 4 digit number. Game year standardised to this year +544. 2013-09-01 13:23:23 +01:00
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Erthilo
f31185e052 Robot Analyzer. Health analyzer for robots. 2013-09-01 00:15:47 +01:00
Erthilo
1992a10b52 More attempts at string limit string reduction. 2013-08-31 20:13:03 +01:00
Erthilo
eb318ec861 Species now have individual punch damages. 2013-08-31 20:12:40 +01:00