cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-19 14:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,231 Commits 5 Branches 1 Tag
55193f24f63f6c807b77eff0f0546b3f93a792aa
Commit Graph

4683 Commits

Author SHA1 Message Date
SkyMarshal
55193f24f6 Merge pull request #1313 from caelaislinn/master 
minor changes to artifacts
 2012-06-18 19:54:24 -07:00
SkyMarshal
ebe7993e69 Merge pull request #1311 from chickenswings62/master 
New constructional objects
 2012-06-18 17:55:53 -07:00
caelaislinn
d6d8007295 reduced spawn chance, added chance to touch on pull 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-19 07:56:47 +10:00
caelaislinn
f17439f1e3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-19 07:37:28 +10:00
chickenswings62
78b2dae2c1 Fixed it up, as a note. The best way to place this is to make a table on top of you, then the frame. I haven't yet figured out a way to make this fella spawn one tile ahead of sight. (I'm a newb as coding. But I'd love to help however I can.) 
Help would be welcome, of course.
 2012-06-18 23:05:57 +02:00
chickenswings62
20b1b0f1c9 Whoops, fixed the object name. 2012-06-18 20:38:57 +02:00
chickenswings62
de128e419a Added the coat rack, and filling cabinet to build able objects. Added a small version of the construction frame, starts unanchored to allow the player to put it in place. Cell chargers and normal rechargers are now buildable. 2012-06-18 20:02:22 +02:00
SkyMarshal
d9a8dc94a2 Merge pull request #1310 from CIB/master 
Nerfed chloral hydrate, buffed sleep toxin.
 2012-06-18 09:06:16 -07:00
CIB
09b7fdee1e Nerfed medical mecha sleeper capturing speed. 2012-06-18 06:16:56 -07:00
CIB
9bc85f2883 Fixed comma error. 2012-06-18 05:55:45 -07:00
CIB
85d99c78fc Nerfed chloral hydrate, buffed sleep toxin. 
- Chloral hydrate will now take a little longer to take effect and stay in your blood for a shorter duration
- Sleep toxin will now stay in your blood twice as long
 2012-06-18 05:52:39 -07:00
caelaislinn
0e1bcfc981 minor updates 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-18 22:41:00 +10:00
caelaislinn
2e5a5405a4 - Ported ISaidNo's artifact code. Will look into adding xenoarchaelogy [anomaly] base near RnD at some point. 
- Modified dme.
- Modified changelog.

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-18 22:37:56 +10:00
DeusDactyl
2c7c078ebe Grammar fixes 
Finally fixes tons of capitalization errors and whatnot in clothing.
 2012-06-17 20:58:42 -04:00
caelaislinn
25752d58cd more redacted updates 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 20:46:49 +10:00
caelaislinn
d4e25997db fix for an unsimulated turf bug 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 20:42:28 +10:00
caelaislinn
9705edff08 some missing contraband changes (increased BS12 poster %) 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 20:41:58 +10:00
caelaislinn
e8d1a3b2ff Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-17 02:27:10 +10:00
caelaislinn
657ac7ab7b [redacted] 
(I've fully tested it, it works nicely)

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-17 02:24:37 +10:00
Miniature
2898b6813b Added a thing to give a message to admins when a tile is stepped on, requested by Hawk. 
To use, spawn a /obj/effect/admin_log_trap on whatever tile you want to have a message, then whenever anyone steps on that tile a message will sent to all admins, like explosions.

Feel free to move it out of my WIP folder if you want.
 2012-06-16 22:28:47 +09:30
caelaislinn
e256c40f86 possible glitch with contraband 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 20:12:21 +10:00
caelaislinn
93fddbf8c7 added glass descriptions for new alcohols 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 12:34:33 +10:00
caelaislinn
f1782ec017 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/energy_field.dm
	code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm
	code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 12:02:29 +10:00
caelaislinn
fc1ef5e4d2 adding reverted files 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 11:42:33 +10:00
caelaislinn
5dff5ccc43 adding missing shield files 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-16 11:34:39 +10:00
Hawk-v3
e68a32c173 Revert All of Cael_Aislinn's stuff from the last day, committed by Cib. 
Reason: Compile Error, hung server. Damnit Cael.
 2012-06-15 22:33:18 +01:00
Mloc
9064a15bca Merge pull request #1297 from CIB/master 
No more involuntary and jobbanned antags
 2012-06-15 07:48:38 -07:00
CIB
e9c3cba9da Merge pull request #1291 from caelaislinn/master 
buildable shield generators, new contraband items, misc
 2012-06-15 03:39:43 -07:00
cib
8e17e28dd4 Mode setup no longer forces people into antagonist. 
Instead of trying to get the necessary antags no matter what, mode setup
will now treat a lack of volunary antags just like a lack of total
players
and
abort the mode.
 2012-06-15 12:32:20 +02:00
SkyMarshal
b5435aaab2 Merge pull request #1293 from CIB/master 
Separate moderator listing.. also an old commit
 2012-06-14 11:34:30 -07:00
cib
fc54aabaff Merge branch 'master' of github.com:CIB/Baystation12 2012-06-14 20:26:19 +02:00
cib
647e1c71fd Added a separate config/moderators.txt config file 2012-06-14 20:24:38 +02:00
CIB
84122a8ca3 Merge pull request #1286 from SkyMarshal/Blueprints 
Blueprints updates, removed duplicate proc.
 2012-06-14 11:10:42 -07:00
CompactNinja
3748b07ec1 Custom item for RawrTaicho. 2012-06-15 03:03:42 +09:30
caelaislinn
7b65a50436 dme changes 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-15 01:17:23 +10:00
caelaislinn
1da4ae4363 added energy shields, added shield generators, shield capacitors, made both buildable with high level research, commented explosion changes (too laggy). 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-15 01:14:40 +10:00
caelaislinn
2b9b845daf possible fix for a conveyor bug 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-15 00:06:20 +10:00
caelaislinn
37bee15787 missed some contraband additions (deadrum, sprites) 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-15 00:06:06 +10:00
caelaislinn
abb12d1366 added some new contraband items 
- absinthe, a strong alcohol with an LSD-like effect
- deadrum, a poisonously sweet form of rum
- cigars
- blood tomato seeds
- liberty cap seeds
- plump helmet seeds

* Cigars are also [still] obtainable from cigarette vending machines, if you have a coin

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-14 23:54:14 +10:00
caelaislinn
16eabd55ea Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-14 22:52:33 +10:00
caelaislinn
3f19d356d6 wip explosions modifications 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-14 22:52:23 +10:00
Albert Iordache
a278b7c29f Runtime error fixes for AI camera chunks and ZAS ZConnect() 2012-06-14 07:50:19 +03:00
SkyMarshal
606efcb514 Fixes the goddamn magick updating detective stuff. 2012-06-13 19:05:41 -07:00
SkyMarshal
5765aac899 Fuck it, good enough for now. 2012-06-13 17:28:03 -07:00
SkyMarshal
d4393c482d Removed a duplicate proc. Pimped out the Blueprints. 2012-06-13 17:05:43 -07:00
SkyMarshal
d3258b4fed ZAS fixes and statistics logging. 2012-06-13 16:55:00 -07:00
caelaislinn
bcf1b8a0b9 ghosts can understand tajaran 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-06-11 15:41:13 +10:00
SkyMarshal
1dea20c30e Merge pull request #1269 from Erthilo/TGUpdates 
TG Updates r3721 to r3745 Redo
 2012-06-09 17:50:05 -07:00
Mloc
8f7bec62d5 Possible fix for metroids lagging up the server. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-06-09 23:11:31 +01:00
SkyMarshal
57fd77b461 Merge pull request #1274 from Erthilo/master 
Randomises blob weakness/strengths + removal of customs by request + changelog!
 2012-06-09 11:58:29 -07:00