cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 2 Branches 1 Tag
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

6153 Commits

Author SHA1 Message Date
Zuhayr
8d98fe7582 Merge resolution. 2013-08-19 16:07:03 -07:00
Zuhayr
3e70c949e6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-19 16:04:34 -07:00
Zuhayr
67f3f5a3c4 Podmen prompt/spawn should work now. 2013-08-19 15:58:08 -07:00
Zuhayr
5bd6170e0c Diona will now be born from pods as nymphs. 2013-08-19 15:20:13 -07:00
Zuhayr
cffac0bfc2 Using dev map. 2013-08-19 15:05:44 -07:00
Zuhayr
6d8bb8dfe6 Hopefully a fix for Dionaea weirdness regarding pods. 2013-08-19 11:53:24 -07:00
Segrain
18b26c57b7 Inertia fix. 2013-08-19 13:05:52 +03:00
Segrain
cd4eaecf21 Fix for #3549. 2013-08-19 13:05:00 +03:00
Chinsky
4262e6b6bc Merge pull request #3547 from Zuhayr/master 
Borer prompt, dionaea fix
 2013-08-19 01:27:11 -07:00
Kilakk
abe170e006 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	baystation12.dme
 2013-08-19 00:27:28 -04:00
Kilakk
8d2910da37 Bees are simple_animals, not machines. Bluh. 2013-08-18 22:52:39 -04:00
Segrain
2304b743ce Reagent scanner's addition. 2013-08-17 17:00:33 +03:00
Segrain
8456647120 Type check. 2013-08-17 16:58:57 +03:00
Zuhayr
a30f7167bd Removed outdated var, fixed failure to show garbled monkey speech. 2013-08-17 19:03:20 -07:00
Mloc-Argent
e809be825e Merge branch 'master' into dev 
Conflicts:
	code/modules/mob/say.dm
 2013-08-16 22:22:42 +01:00
Zuhayr
9c58348879 Holodeck exploit fix. 2013-08-17 04:41:28 -07:00
Mloc-Argent
1e980a9cc1 Merge branch 'master' into dev 2013-08-15 15:29:53 +01:00
Zuhayr
d937900d13 Compile fix. 2013-08-14 10:29:17 -07:00
Zuhayr
1c30387a44 Merge resolution in Engineering.dm 2013-08-14 10:05:55 -07:00
Zuhayr
033b0450a0 Engineering merge. 2013-08-14 20:00:38 -07:00
Zuhayr
c19d136996 Podman fix. 2013-08-14 19:58:39 -07:00
Chinsky
b8dc7cc939 Merge pull request #3505 from Zuhayr/master 
Language cleanup/mouse speech fix.
 2013-08-13 16:48:45 -07:00
Zuhayr
e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr
623a2978b7 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:09 -07:00
Zuhayr
1bdb1b6694 Merge pull request #3507 from Segrain/master 
Internals for everyone.
 2013-08-13 16:39:14 -07:00
DJSnapshot
cb20332de5 Added potential for chief engineer's locker to spawn with either a brown vest or webbing 2013-08-13 16:16:20 -07:00
Jamini
f05c44dc23 Praying this works 
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering

Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-08-13 18:57:08 -04:00
Mloc-Argent
7ac43fa871 Merge branch 'master' into dev 2013-08-13 22:21:37 +01:00
Mloc-Argent
e2e747fa0a Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2013-08-13 22:21:09 +01:00
Mloc-Argent
310283f581 Merge branch 'master' into dev 2013-08-13 22:20:39 +01:00
meyar
2819b6ac96 Gives IA security headsets as DEMOCRACY'D here: http://baystation12.net/forums/viewtopic.php?f=5&t=8096 2013-08-13 16:49:17 -04:00
meyar
70176f7132 Gives those asshole greyshirts fukkin' air tanks. The fucks. 2013-08-13 16:45:46 -04:00
Segrain
4e2ba5325a Internals box fix. 2013-08-13 21:06:38 +03:00
Zuhayr
bbfe26bde8 Merge pull request #3503 from Mloc/master 
Fully reverts clickdelay change.
 2013-08-13 05:20:35 -07:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change. 
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-13 13:10:09 +01:00
Segrain
2de41230c9 Merge remote-tracking branch 'upstream/master' 2013-08-13 13:41:24 +03:00
Segrain
ccb87c446a Vox beards. 2013-08-13 09:21:28 +03:00
Zuhayr
86c66ebcd4 Possible fix to weird podman behavior. 2013-08-13 14:51:39 -07:00
Zuhayr
254cef453a Added a preferences switch for diona. 2013-08-13 14:16:07 -07:00
Mloc
3a85e7afb2 Merge pull request #3495 from Zuhayr/master 
Vox carryover fixes.
 2013-08-12 07:03:55 -07:00
Zuhayr
bed45dd864 Removes Vox flavour text carried over from chargen. 2013-08-13 00:03:14 -07:00
Zuhayr
4874d5691b Removes multicultural mrowling Vox from Heist. 2013-08-13 00:00:34 -07:00
Zuhayr
44aa77f7de Adds a delay to the RCD when building. 2013-08-12 22:51:27 -07:00
Zuhayr
5476ae192d Attempting to reduce incidence of clickspam against mobs. 2013-08-12 22:44:57 -07:00
Mloc
82eb19df9a Merge pull request #3493 from Zuhayr/master 
Click delay fixes (part 1)
 2013-08-12 05:58:46 -07:00
Erthilo
9d1bbb16d0 Adds explosive implant admin messages, and jump button for explosions. 2013-08-12 12:34:13 +01:00
Zuhayr
b3e184ad0a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-12 00:10:12 -07:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo
459aafd523 Fixed borg sprites no resetting with reset board. 2013-08-11 21:32:02 +01:00
Erthilo
166a7e57a6 Cult 'raise' rune how completely heals raised corpse. 2013-08-11 17:38:12 +01:00